svn commit: r426704 - in head/devel/tbb: . files
Ganael LAPLANCHE
martymac at FreeBSD.org
Mon Nov 21 11:15:48 UTC 2016
Author: martymac
Date: Mon Nov 21 11:15:47 2016
New Revision: 426704
URL: https://svnweb.freebsd.org/changeset/ports/426704
Log:
- Add missing SONAME [1]
- Use Clang-specific build files when appropriate
PR: 214579 [1]
Submitted by: Yuri Victorovich <yuri at rawbw.com> [1]
Added:
head/devel/tbb/files/patch-FreeBSD.gcc.inc (contents, props changed)
Modified:
head/devel/tbb/Makefile
Modified: head/devel/tbb/Makefile
==============================================================================
--- head/devel/tbb/Makefile Mon Nov 21 11:02:44 2016 (r426703)
+++ head/devel/tbb/Makefile Mon Nov 21 11:15:47 2016 (r426704)
@@ -3,6 +3,7 @@
PORTNAME= tbb
PORTVERSION= 2017.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
LOCAL/martymac
@@ -34,18 +35,16 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//}
.include <bsd.port.pre.mk>
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}; \
Added: head/devel/tbb/files/patch-FreeBSD.gcc.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/tbb/files/patch-FreeBSD.gcc.inc Mon Nov 21 11:15:47 2016 (r426704)
@@ -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)
+
More information about the svn-ports-all
mailing list