Index: head/devel/tbb/Makefile =================================================================== --- head/devel/tbb/Makefile (revision 426703) +++ head/devel/tbb/Makefile (revision 426704) @@ -1,68 +1,67 @@ # Created by: Arun Sharma # $FreeBSD$ PORTNAME= tbb PORTVERSION= 2017.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \ LOCAL/martymac DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20160916oss_src MAINTAINER= martymac@FreeBSD.org COMMENT= Library that provides thread building blocks LICENSE= GPLv2 SUB_FILES= tbb.pc SUB_LIST= prefix="${PREFIX}" \ name="${PORTNAME}" \ description="${COMMENT}" \ version="${PORTVERSION}" OPTIONS_DEFINE= DOCS PORTDOCS= * ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= has not been ported to this platform USE_LDCONFIG= yes USES= compiler gmake tar:tgz ALL_TARGET= default WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//} .include post-extract: -.if ${CC} != "gcc" - @${CP} ${WRKSRC}/build/FreeBSD.gcc.inc ${WRKSRC}/build/FreeBSD.${CC}.inc +.if ${CC} != ${COMPILER_TYPE} + @${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC}.inc .endif @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ post-patch: - @${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e 's|g++|${CXX}|g' \ - ${WRKSRC}/build/FreeBSD.${CC}.inc -.if ${COMPILER_TYPE} != "gcc" - @${REINPLACE_CMD} -e 's| -fno-schedule-insns2||g' \ - ${WRKSRC}/build/FreeBSD.${CC}.inc -.endif + @${REINPLACE_CMD} \ + -e '/^CONLY =/s/^CONLY =.*/CONLY = ${CC}/' \ + -e '/^CPLUS =/s/^CPLUS =.*/CPLUS = ${CXX}/' \ + ${WRKSRC}/build/FreeBSD.${CC}.inc do-install: cd ${WRKSRC}; \ ${INSTALL_LIB} build/FreeBSD*release/libtbb.so \ ${STAGEDIR}${PREFIX}/lib/libtbb.so.4; \ ${LN} -sf libtbb.so.4 \ ${STAGEDIR}${PREFIX}/lib/libtbb.so; \ ${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.4; \ ${LN} -sf libtbbmalloc.so.4 \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so; \ ${MKDIR} ${STAGEDIR}${PREFIX}/include/tbb/; \ cd include/tbb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/tbb/ ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} post-install: ${INSTALL_DATA} ${WRKDIR}/tbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: head/devel/tbb/files/patch-FreeBSD.gcc.inc =================================================================== --- head/devel/tbb/files/patch-FreeBSD.gcc.inc (nonexistent) +++ head/devel/tbb/files/patch-FreeBSD.gcc.inc (revision 426704) @@ -0,0 +1,11 @@ +--- build/FreeBSD.gcc.inc.orig 2016-11-18 13:37:51.743639461 +0000 ++++ build/FreeBSD.gcc.inc 2016-11-18 13:41:28.615767655 +0000 +@@ -30,7 +30,7 @@ + + CPLUS = g++ + CONLY = gcc +-LIB_LINK_FLAGS = -shared ++LIB_LINK_FLAGS = -shared -Wl,-soname=$(BUILDING_LIBRARY) + LIBS = -lpthread + C_FLAGS = $(CPLUS_FLAGS) + Property changes on: head/devel/tbb/files/patch-FreeBSD.gcc.inc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property