Index: head/devel/tbb/Makefile =================================================================== --- head/devel/tbb/Makefile (revision 430718) +++ head/devel/tbb/Makefile (revision 430719) @@ -1,67 +1,68 @@ # Created by: Arun Sharma # $FreeBSD$ PORTNAME= tbb PORTVERSION= 2017.1 -PORTREVISION= 2 +PORTREVISION= 3 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//} +CC_BASENAME= ${CC:C,^.*/,,} .include post-extract: -.if ${CC} != ${COMPILER_TYPE} - @${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC}.inc +.if ${CC_BASENAME} != ${COMPILER_TYPE} + @${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC_BASENAME}.inc .endif @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ post-patch: @${REINPLACE_CMD} \ - -e '/^CONLY =/s/^CONLY =.*/CONLY = ${CC}/' \ - -e '/^CPLUS =/s/^CPLUS =.*/CPLUS = ${CXX}/' \ - ${WRKSRC}/build/FreeBSD.${CC}.inc + -e '/^CONLY =/s|^CONLY =.*|CONLY = ${CC}|' \ + -e '/^CPLUS =/s|^CPLUS =.*|CPLUS = ${CXX}|' \ + ${WRKSRC}/build/FreeBSD.${CC_BASENAME}.inc do-install: cd ${WRKSRC}; \ ${INSTALL_LIB} build/FreeBSD*release/libtbb.so \ ${STAGEDIR}${PREFIX}/lib/libtbb.so.2; \ ${LN} -sf libtbb.so.2 \ ${STAGEDIR}${PREFIX}/lib/libtbb.so; \ ${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.2; \ ${LN} -sf libtbbmalloc.so.2 \ ${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-common.inc =================================================================== --- head/devel/tbb/files/patch-common.inc (nonexistent) +++ head/devel/tbb/files/patch-common.inc (revision 430719) @@ -0,0 +1,26 @@ +Accept absolute paths for $compiler variable (and so for $CC) + +--- build/common.inc.orig 2016-09-22 10:28:03.000000000 +0000 ++++ build/common.inc 2017-01-05 21:44:56.121147000 +0000 +@@ -106,17 +106,17 @@ + target:=$(tbb_os) + endif + # process host/target compiler-dependent build configuration +- ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler).inc)) +- $(error "$(compiler)" is not supported on $(target). Add build/$(target).$(compiler).inc file with compiler-specific settings. ) ++ ifeq (,$(wildcard $(tbb_root)/build/$(target).$(notdir $(compiler)).inc)) ++ $(error "$(notdir $(compiler))" is not supported on $(target). Add build/$(target).$(notdir $(compiler)).inc file with compiler-specific settings. ) + endif +- include $(tbb_root)/build/$(target).$(compiler).inc ++ include $(tbb_root)/build/$(target).$(notdir $(compiler)).inc + endif + + ifneq ($(BUILDING_PHASE),1) + # definitions for top-level Makefiles + origin_build_dir:=$(origin tbb_build_dir) + tbb_build_dir?=$(tbb_root)$(SLASH)build +- export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler)_$(runtime)$(CPF_SUFFIX) ++ export tbb_build_prefix?=$(tbb_os)_$(arch)_$(notdir $(compiler))_$(runtime)$(CPF_SUFFIX) + work_dir=$(tbb_build_dir)$(SLASH)$(tbb_build_prefix) + endif # BUILDING_PHASE != 1 + Property changes on: head/devel/tbb/files/patch-common.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