Attachment #157771 for bug #200887

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

Lines 3-13 Link Here

(-)Makefile (-2 / +2 lines)
3		3
4	PORTNAME= tbb	4	PORTNAME= tbb
5	PORTVERSION= 4.3.0	5	PORTVERSION= 4.3.0
6	PORTREVISION= 1	6	PORTREVISION= 2
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
10	DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20140724oss_src	10	DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20150611oss_src
11		11
12	MAINTAINER= martymac@FreeBSD.org	12	MAINTAINER= martymac@FreeBSD.org
13	COMMENT= Library that provides thread building blocks	13	COMMENT= Library that provides thread building blocks

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (tbb43_20140724oss_src.tgz) = fc15e84befe1acadad3589e7f2a461443bef77cc699038875ef2692e1ceb0bb4	1	SHA256 (tbb43_20150611oss_src.tgz) = 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9
2	SIZE (tbb43_20140724oss_src.tgz) = 2790795	2	SIZE (tbb43_20150611oss_src.tgz) = 2757631




--- build/FreeBSD.inc.orig	2015-06-11 14:18:55 UTC
+++ build/FreeBSD.inc
@@ -29,14 +29,14 @@ ifndef arch
 endif
 
 ifndef runtime
-        gcc_version:=$(shell gcc -dumpversion)
+        gcc_version:=$(shell $(CC) -dumpversion)
         os_version:=$(shell uname -r)
         os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//')
         export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)

 
-native_compiler := gcc
-export compiler ?= gcc
+native_compiler := $(CC)
+export compiler ?= $(CC)
 debugger ?= gdb
 
 CMD=$(SHELL) -c
@@ -46,7 +46,7 @@ RD?=rmdir
 MD?=mkdir -p
 NUL= /dev/null
 SLASH=/

Return to bug 200887

Lines 1-11 Link Here

(-)files/patch-build-FreeBSD.inc (-7 / +7 lines)
1	--- build/FreeBSD.inc.orig 2012-09-03 13:10:45.423760088 -0400	1	--- build/FreeBSD.inc.orig 2015-06-11 14:18:55 UTC
2	+++ build/FreeBSD.inc 2012-09-03 13:13:15.765760027 -0400	2	+++ build/FreeBSD.inc
3	@@ -37,14 +37,14 @@	3	@@ -29,14 +29,14 @@ ifndef arch
4	endif	4	endif
5		5
6	ifndef runtime	6	ifndef runtime
7	- gcc_version:=$(shell gcc -v 2>&1 \| grep 'gcc version' \| sed -e 's/^gcc version //' \| sed -e 's/ .*$$//')	7	- gcc_version:=$(shell gcc -dumpversion)
8	+ gcc_version:=$(shell $(CC) -v 2>&1 \| grep ' version' \| sed -e 's/^.* version //' \| sed -e 's/ .*$$//')	8	+ gcc_version:=$(shell $(CC) -dumpversion)
9	os_version:=$(shell uname -r)	9	os_version:=$(shell uname -r)
10	os_kernel_version:=$(shell uname -r \| sed -e 's/-.*$$//')	10	os_kernel_version:=$(shell uname -r \| sed -e 's/-.*$$//')
11	export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)	11	export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)
Lines 13-24 Link Here
13		13
14	-native_compiler := gcc	14	-native_compiler := gcc
15	-export compiler ?= gcc	15	-export compiler ?= gcc
16	+native_compiler := $(CC)	16	+native_compiler := $(CC)
17	+export compiler ?= $(CC)	17	+export compiler ?= $(CC)
18	debugger ?= gdb	18	debugger ?= gdb
19		19
20	CMD=$(SHELL) -c	20	CMD=$(SHELL) -c
21	@@ -54,7 +54,7 @@	21	@@ -46,7 +46,7 @@ RD?=rmdir
22	MD?=mkdir -p	22	MD?=mkdir -p
23	NUL= /dev/null	23	NUL= /dev/null
24	SLASH=/	24	SLASH=/

Lines 20-25 include/tbb/concurrent_vector.h Link Here

(-)pkg-plist (+2 lines)
20	include/tbb/critical_section.h	20	include/tbb/critical_section.h
21	include/tbb/enumerable_thread_specific.h	21	include/tbb/enumerable_thread_specific.h
22	include/tbb/flow_graph.h	22	include/tbb/flow_graph.h
		23	include/tbb/global_control.h
23	include/tbb/index.html	24	include/tbb/index.html
24	include/tbb/internal/_aggregator_impl.h	25	include/tbb/internal/_aggregator_impl.h
25	include/tbb/internal/_concurrent_queue_impl.h	26	include/tbb/internal/_concurrent_queue_impl.h
Lines 36-41 include/tbb/internal/_mutex_padding.h Link Here
36	include/tbb/internal/_range_iterator.h	37	include/tbb/internal/_range_iterator.h
37	include/tbb/internal/_tbb_strings.h	38	include/tbb/internal/_tbb_strings.h
38	include/tbb/internal/_tbb_windef.h	39	include/tbb/internal/_tbb_windef.h
		40	include/tbb/internal/_template_helpers.h
39	include/tbb/internal/_x86_eliding_mutex_impl.h	41	include/tbb/internal/_x86_eliding_mutex_impl.h
40	include/tbb/internal/_x86_rtm_rw_mutex_impl.h	42	include/tbb/internal/_x86_rtm_rw_mutex_impl.h
41	include/tbb/machine/gcc_armv7.h	43	include/tbb/machine/gcc_armv7.h