Attachment 178563 Details for Bug 215656 – Accept absolute paths for CC and CXX

[patch] Accept absolute paths for CC and CXX

patch-tbb.txt (text/plain), 2.69 KB, created by Ganael LAPLANCHE on 2017-01-05 22:12:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2017-01-05 22:12:39 UTC

Size: 2.69 KB

patch

obsolete

>diff -aurN devel/tbb.orig/files/patch-common.inc devel/tbb/files/patch-common.inc
>--- devel/tbb.orig/files/patch-common.inc	1970-01-01 00:00:00.000000000 +0000
>+++ devel/tbb/files/patch-common.inc	2017-01-05 21:59:15.779875000 +0000
>@@ -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
>+ 
>diff -aurN devel/tbb.orig/Makefile devel/tbb/Makefile
>--- devel/tbb.orig/Makefile	2016-11-25 11:22:51.000000000 +0000
>+++ devel/tbb/Makefile	2017-01-05 21:54:44.471852000 +0000
>@@ -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 @@
> 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}; \

Actions: View | Diff

Attachments on bug 215656: 178563