Date: Tue, 10 May 2016 16:46:36 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414946 - head/print/hplip-plugin Message-ID: <201605101646.u4AGkamv091776@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <jarles.live@gmail.com> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605101646.u4AGkamv091776>