svn commit: r430719 - in head/devel/tbb: . files

[Ganael LAPLANCHE]

Author: martymac
Date: Fri Jan  6 17:33:04 2017
New Revision: 430719
URL: https://svnweb.freebsd.org/changeset/ports/430719

Log:
  Accept absolute paths for CC and CXX
  
  PR:		215656
  Submitted by:	rozhuk.im at gmail.com

Added:
  head/devel/tbb/files/patch-common.inc   (contents, props changed)
Modified:
  head/devel/tbb/Makefile

Modified: head/devel/tbb/Makefile
==============================================================================
--- head/devel/tbb/Makefile	Fri Jan  6 17:23:57 2017	(r430718)
+++ head/devel/tbb/Makefile	Fri Jan  6 17:33:04 2017	(r430719)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tbb
 PORTVERSION=	2017.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
 		LOCAL/martymac
@@ -31,20 +31,21 @@ USES=	compiler gmake tar:tgz
 ALL_TARGET=	default
 
 WRKSRC=	${WRKDIR}/${DISTNAME:S/_src//}
+CC_BASENAME=	${CC:C,^.*/,,}
 
 .include <bsd.port.pre.mk>
 
 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}; \

Added: head/devel/tbb/files/patch-common.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/tbb/files/patch-common.inc	Fri Jan  6 17:33:04 2017	(r430719)
@@ -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
+