pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tbb: Fix install, add libtbb_proxy



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Sep 14 10:13:46 2018 -0500
Changeset:	b9130a1633cffb0590d7665d9a4966b4dcbb67ac

Modified Files:
	tbb/Makefile
	tbb/PLIST

Log Message:
tbb: Fix install, add libtbb_proxy

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b9130a1633cffb0590d7665d9a4966b4dcbb67ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tbb/Makefile | 17 +++++++++++------
 tbb/PLIST    |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs:
diff --git a/tbb/Makefile b/tbb/Makefile
index 4161a8f270..93ebe6725f 100644
--- a/tbb/Makefile
+++ b/tbb/Makefile
@@ -7,6 +7,7 @@
 
 ###########################################################
 # Unconverted and partially converted FreeBSD port syntax:
+# Some of this may be useful for NetBSD and FreeBSD builds
 
 #SUB_FILES=	tbb.pc
 #SUB_LIST=	prefix="${PREFIX}" \
@@ -46,7 +47,6 @@ USE_TOOLS+=	gmake pax
 BUILD_TARGET=	default
 
 PV=		2018.5
-DOCSDIR=	${PREFIX}/share/doc/tbb
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -60,19 +60,24 @@ INSTALLATION_DIRS=	include/tbb lib share/doc/tbb
 
 do-install:
 	cd ${WRKSRC}; \
-	${INSTALL_LIB} build/\${BUILD_OPSYS}*release/libtbb.so \
-		${DESTDIR}${PREFIX}/lib/libtbb.so.2; \
+	${INSTALL_LIB} build/${BUILD_OPSYS}*release/libtbb.so.2 \
+		${DESTDIR}${PREFIX}/lib; \
 	${LN} -sf libtbb.so.2 \
 		${DESTDIR}${PREFIX}/lib/libtbb.so; \
-	${INSTALL_LIB} build/\${BUILD_OPSYS}*release/libtbbmalloc.so \
-		${DESTDIR}${PREFIX}/lib/libtbbmalloc.so.2; \
+	${INSTALL_LIB} build/${BUILD_OPSYS}*release/libtbbmalloc.so.2 \
+		${DESTDIR}${PREFIX}/lib; \
 	${LN} -sf libtbbmalloc.so.2 \
 		${DESTDIR}${PREFIX}/lib/libtbbmalloc.so; \
+	${INSTALL_LIB} build/${BUILD_OPSYS}*release/libtbbmalloc_proxy.so.2 \
+		${DESTDIR}${PREFIX}/lib; \
+	${LN} -sf libtbbmalloc_proxy.so.2 \
+		${DESTDIR}${PREFIX}/lib/libtbbmalloc_proxy.so; \
 	cd include/tbb/ && pax -rw . ${DESTDIR}${PREFIX}/include/tbb/
-	cd ${WRKSRC}/doc/html && pax -rw . ${DESTDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc/html && pax -rw . ${DESTDIR}${PREFIX}/share/doc/tbb
 
 post-install:
 	${RM} ${DESTDIR}${PREFIX}/include/tbb/*.orig
+	${CHMOD} -R g-w ${DESTDIR}${PREFIX}
 # 	${INSTALL_DATA} ${WRKDIR}/tbb.pc ${DESTDIR}${PREFIX}/libdata/pkgconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/tbb/PLIST b/tbb/PLIST
index aa245a5e2a..bf54fa1cb8 100644
--- a/tbb/PLIST
+++ b/tbb/PLIST
@@ -112,6 +112,8 @@ lib/libtbb.so
 lib/libtbb.so.2
 lib/libtbbmalloc.so
 lib/libtbbmalloc.so.2
+lib/libtbbmalloc_proxy.so
+lib/libtbbmalloc_proxy.so.2
 share/doc/tbb/a00002.html
 share/doc/tbb/a00004.html
 share/doc/tbb/a00006.html


Home | Main Index | Thread Index | Old Index