From owner-svn-ports-head@freebsd.org Tue May 10 16:46:37 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DABCFB36C3A; Tue, 10 May 2016 16:46:37 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 914691DB5; Tue, 10 May 2016 16:46:37 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AGka6j091777; Tue, 10 May 2016 16:46:36 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AGkamv091776; Tue, 10 May 2016 16:46:36 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201605101646.u4AGkamv091776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 10 May 2016 16:46:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414946 - head/print/hplip-plugin X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2016 16:46:38 -0000 Author: tijl Date: Tue May 10 16:46:36 2016 New Revision: 414946 URL: https://svnweb.freebsd.org/changeset/ports/414946 Log: Some plugins have an SONAME field that is different from the library name so the wrapper library that links to such a plugin cannot find it at runtime. Create dummy plugins without SONAME and link the wrapper libraries against that. PR: 209426 Tested by: Andreas Beck Modified: head/print/hplip-plugin/Makefile Modified: head/print/hplip-plugin/Makefile ============================================================================== --- head/print/hplip-plugin/Makefile Tue May 10 16:26:21 2016 (r414945) +++ head/print/hplip-plugin/Makefile Tue May 10 16:46:36 2016 (r414946) @@ -3,7 +3,7 @@ PORTNAME= hplip-plugin PORTVERSION= 3.16.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= http://hplipopensource.com/hplip-web/plugin/ DISTNAME= hplip-${DISTVERSION}-plugin @@ -46,10 +46,14 @@ do-extract: --keep --noexec --nox11 --target ${WRKSRC} do-build: - ${CC} ${CFLAGS} -Wall -fPIC -c ${FILESDIR}/wrap.c -o ${WRKSRC}/wrap.o + ${MKDIR} ${WRKSRC}/build + ${CC} ${CFLAGS} -Wall -fPIC -c ${FILESDIR}/wrap.c \ + -o ${WRKSRC}/build/wrap.o .for p in ${PLUGINS} - (cd ${WRKSRC} && ${BRANDELF} -t FreeBSD ${p:T}-${LINARCH}.so && \ - ${CC} ${CFLAGS} ${LDFLAGS} -shared -fPIC -o ${p:T}.so wrap.o \ + ${BRANDELF} -t FreeBSD ${WRKSRC}/${p:T}-${LINARCH}.so + (cd ${WRKSRC}/build \ + && ${CC} -shared -fPIC -o ${p:T}-${LINARCH}.so wrap.o \ + && ${CC} ${CFLAGS} ${LDFLAGS} -shared -fPIC -o ${p:T}.so wrap.o \ ${p:T}-${LINARCH}.so -Wl,-rpath,${PREFIX}/share/hplip/${p:H}) .endfor @@ -62,7 +66,7 @@ do-install: # -m 555 because HPLIP checks that the plugins are +x. ${INSTALL_LIB} -m 555 ${WRKSRC}/${p:T}-${LINARCH}.so \ ${STAGEDIR}${PREFIX}/share/hplip/${p}-${LINARCH}.so - ${INSTALL_LIB} -m 555 ${WRKSRC}/${p:T}.so \ + ${INSTALL_LIB} -m 555 ${WRKSRC}/build/${p:T}.so \ ${STAGEDIR}${PREFIX}/share/hplip/${p}.so .endfor ${INSTALL_DATA} ${WRKSRC}/plugin.spec ${STAGEDIR}${PREFIX}/share/hplip