Attachment #178563 for bug #215656

View | Details | Raw Unified | Return to bug 215656
Collapse All | Expand All




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
 





PORTNAME=	tbb
PORTVERSION=	2017.1
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
		LOCAL/martymac

ALL_TARGET=	default

WRKSRC=	${WRKDIR}/${DISTNAME:S/_src//}
CC_BASENAME=	${CC:C,^.*/,,}

.include <bsd.port.pre.mk>

post-extract:
.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_BASENAME}.inc

do-install:
	cd ${WRKSRC}; \

Return to bug 215656

Lines 3-9 Link Here

(-)devel/tbb/Makefile (-6 / +7 lines)
3		3
4	PORTNAME= tbb	4	PORTNAME= tbb
5	PORTVERSION= 2017.1	5	PORTVERSION= 2017.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \	8	MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
9	LOCAL/martymac	9	LOCAL/martymac
Lines 31-50 Link Here
31	ALL_TARGET= default	31	ALL_TARGET= default
32		32
33	WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//}	33	WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//}
		34	CC_BASENAME= ${CC:C,^.*/,,}
34		35
35	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
36		37
37	post-extract:	38	post-extract:
38	.if ${CC} != ${COMPILER_TYPE}	39	.if ${CC_BASENAME} != ${COMPILER_TYPE}
39	@${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC}.inc	40	@${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC_BASENAME}.inc
40	.endif	41	.endif
41	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/	42	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/
42		43
43	post-patch:	44	post-patch:
44	@${REINPLACE_CMD} \	45	@${REINPLACE_CMD} \
45	-e '/^CONLY =/s/^CONLY =.*/CONLY = ${CC}/' \	46	-e '/^CONLY =/s\|^CONLY =.*\|CONLY = ${CC}\|' \
46	-e '/^CPLUS =/s/^CPLUS =.*/CPLUS = ${CXX}/' \	47	-e '/^CPLUS =/s\|^CPLUS =.*\|CPLUS = ${CXX}\|' \
47	${WRKSRC}/build/FreeBSD.${CC}.inc	48	${WRKSRC}/build/FreeBSD.${CC_BASENAME}.inc
48		49
49	do-install:	50	do-install:
50	cd ${WRKSRC}; \	51	cd ${WRKSRC}; \

Line 0 Link Here

(-)devel/tbb/files/patch-common.inc (+26 lines)
	1	Accept absolute paths for $compiler variable (and so for $CC)
	2
	3	--- build/common.inc.orig 2016-09-22 10:28:03.000000000 +0000
	4	+++ build/common.inc 2017-01-05 21:44:56.121147000 +0000
	5	@@ -106,17 +106,17 @@
	6	target:=$(tbb_os)
	7	endif
	8	# process host/target compiler-dependent build configuration
	9	- ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler).inc))
	10	- $(error "$(compiler)" is not supported on $(target). Add build/$(target).$(compiler).inc file with compiler-specific settings. )
	11	+ ifeq (,$(wildcard $(tbb_root)/build/$(target).$(notdir $(compiler)).inc))
	12	+ $(error "$(notdir $(compiler))" is not supported on $(target). Add build/$(target).$(notdir $(compiler)).inc file with compiler-specific settings. )
	13	endif
	14	- include $(tbb_root)/build/$(target).$(compiler).inc
	15	+ include $(tbb_root)/build/$(target).$(notdir $(compiler)).inc
	16	endif
	17
	18	ifneq ($(BUILDING_PHASE),1)
	19	# definitions for top-level Makefiles
	20	origin_build_dir:=$(origin tbb_build_dir)
	21	tbb_build_dir?=$(tbb_root)$(SLASH)build
	22	- export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler)_$(runtime)$(CPF_SUFFIX)
	23	+ export tbb_build_prefix?=$(tbb_os)_$(arch)_$(notdir $(compiler))_$(runtime)$(CPF_SUFFIX)
	24	work_dir=$(tbb_build_dir)$(SLASH)$(tbb_build_prefix)
	25	endif # BUILDING_PHASE != 1
	26