Attachment #127461 for bug #171297

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




USE_LDCONFIG=	yes
USE_GMAKE=	yes
ALL_TARGET=	default
MAKE_ENV=	CPLUS=${CXX}

WRKSRC=	${WRKDIR}/tbb40_233oss

post-extract:
	@${CP} ${WRKSRC}/build/FreeBSD.gcc.inc ${WRKSRC}/build/FreeBSD.${CC}.inc
	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/

post-patch:
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
		-e 's|gcc|${CC}|g' -e 's|g++|${CXX}|g' \
		${WRKSRC}/build/FreeBSD.${CC}.inc

do-install:
	cd ${WRKSRC}; \

Lines 1-11 Link Here

(-)tbb/files/patch-build-FreeBSD.gcc.inc (-11 lines)
1	--- build/FreeBSD.gcc.inc.orig 2010-08-28 00:14:43.080234020 +0200
2	+++ build/FreeBSD.gcc.inc 2010-08-28 00:14:53.400821755 +0200
3	@@ -37,7 +37,7 @@
4
5	TBB_NOSTRICT = 1
6
7	-CPLUS = g++
8	+#CPLUS = g++
9	CONLY = gcc
10	LIB_LINK_FLAGS = -shared
11	LIBS = -lpthread




--- build/FreeBSD.inc.orig	2012-09-03 13:10:45.423760088 -0400
+++ build/FreeBSD.inc	2012-09-03 13:13:15.765760027 -0400
@@ -37,14 +37,14 @@
 endif
 
 ifndef runtime
-        gcc_version:=$(shell gcc -v 2>&1 | grep 'gcc version' | sed -e 's/^gcc version //' | sed -e 's/ .*$$//')
+        gcc_version:=$(shell $(CC) -v 2>&1 | grep ' version' | sed -e 's/^.* version //' | sed -e 's/ .*$$//')
         os_version:=$(shell uname -r)
         os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//')
         export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)
 endif
 
-native_compiler := gcc
-export compiler ?= gcc
+native_compiler := $(CC) 
+export compiler ?= $(CC)
 debugger ?= gdb
 
 CMD=$(SHELL) -c
@@ -54,7 +54,7 @@
 MD?=mkdir -p
 NUL= /dev/null

Lines 5-11 Link Here

(-)tbb/files/version_info_FreeBSD.sh (-1 / +1 lines)
5	echo '"TBB:' "BUILD_HOST\t\t"`hostname -s`" ("`uname -p`")"'" ENDL \'	5	echo '"TBB:' "BUILD_HOST\t\t"`hostname -s`" ("`uname -p`")"'" ENDL \'
6	echo '"TBB:' "BUILD_OS\t\t"`uname -sr`'" ENDL \'	6	echo '"TBB:' "BUILD_OS\t\t"`uname -sr`'" ENDL \'
7	echo '"TBB:' "BUILD_KERNEL\t"`uname -rv`'" ENDL \'	7	echo '"TBB:' "BUILD_KERNEL\t"`uname -rv`'" ENDL \'
8	echo '"TBB:' "BUILD_GCC\t\t"`g++ -v </dev/null 2>&1 \| grep 'gcc.*version'`'" ENDL \'	8	echo '"TBB:' "BUILD_GCC\t\t"`${CXX} -v </dev/null 2>&1 \| grep ' version'`'" ENDL \'
9	[ -z "$COMPILER_VERSION" ] \|\| echo '"TBB:' "BUILD_COMPILER\t"$COMPILER_VERSION'" ENDL \'	9	[ -z "$COMPILER_VERSION" ] \|\| echo '"TBB:' "BUILD_COMPILER\t"$COMPILER_VERSION'" ENDL \'
10	echo '"TBB:' "BUILD_GLIBC\t"`ldconfig -r \| grep -oE '/lib/libc.so.[0-9]+' \| sort -rn \| head -n 1 \| sed 's\|/lib/libc\.so\.\|\|'`'" ENDL \'	10	echo '"TBB:' "BUILD_GLIBC\t"`ldconfig -r \| grep -oE '/lib/libc.so.[0-9]+' \| sort -rn \| head -n 1 \| sed 's\|/lib/libc\.so\.\|\|'`'" ENDL \'
11	echo '"TBB:' "BUILD_LD\t\t"`ld -v \| grep 'version'`'" ENDL \'	11	echo '"TBB:' "BUILD_LD\t\t"`ld -v \| grep 'version'`'" ENDL \'

Return to bug 171297

Lines 23-38 Link Here

(-)tbb/Makefile (-3 / +4 lines)
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	USE_GMAKE= yes	24	USE_GMAKE= yes
25	ALL_TARGET= default	25	ALL_TARGET= default
26	MAKE_ENV= CPLUS=${CXX}
27		26
28	WRKSRC= ${WRKDIR}/tbb40_233oss	27	WRKSRC= ${WRKDIR}/tbb40_233oss
29		28
30	post-extract:	29	post-extract:
		30	@${CP} ${WRKSRC}/build/FreeBSD.gcc.inc ${WRKSRC}/build/FreeBSD.${CC}.inc
31	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/	31	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/
32		32
33	post-patch:	33	post-patch:
34	@${REINPLACE_CMD} 's\|-lpthread\|${PTHREAD_LIBS}\|g' \	34	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
35	${WRKSRC}/build/FreeBSD.gcc.inc	35	-e 's\|gcc\|${CC}\|g' -e 's\|g++\|${CXX}\|g' \
		36	${WRKSRC}/build/FreeBSD.${CC}.inc
36		37
37	do-install:	38	do-install:
38	cd ${WRKSRC}; \	39	cd ${WRKSRC}; \

Lines 1-5 Link Here

(-)tbb/files/patch-build-FreeBSD.inc (-2 / +20 lines)
1	--- build/FreeBSD.inc.orig 2008-06-07 08:56:22.000000000 +0200	1	--- build/FreeBSD.inc.orig 2012-09-03 13:10:45.423760088 -0400
2	+++ build/FreeBSD.inc 2008-12-16 09:32:21.710673762 +0100	2	+++ build/FreeBSD.inc 2012-09-03 13:13:15.765760027 -0400
		3	@@ -37,14 +37,14 @@
		4	endif
		5
		6	ifndef runtime
		7	- gcc_version:=$(shell gcc -v 2>&1 \| grep 'gcc version' \| sed -e 's/^gcc version //' \| sed -e 's/ .*$$//')
		8	+ gcc_version:=$(shell $(CC) -v 2>&1 \| grep ' version' \| sed -e 's/^.* version //' \| sed -e 's/ .*$$//')
		9	os_version:=$(shell uname -r)
		10	os_kernel_version:=$(shell uname -r \| sed -e 's/-.*$$//')
		11	export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)
		12	endif
		13
		14	-native_compiler := gcc
		15	-export compiler ?= gcc
		16	+native_compiler := $(CC)
		17	+export compiler ?= $(CC)
		18	debugger ?= gdb
		19
		20	CMD=$(SHELL) -c
3	@@ -54,7 +54,7 @@	21	@@ -54,7 +54,7 @@
4	MD?=mkdir -p	22	MD?=mkdir -p
5	NUL= /dev/null	23	NUL= /dev/null