Index: head/devel/tbb/files/patch-build-BSD.inc =================================================================== --- head/devel/tbb/files/patch-build-BSD.inc (revision 552512) +++ head/devel/tbb/files/patch-build-BSD.inc (revision 552513) @@ -1,44 +1,47 @@ ---- build/BSD.inc.orig 2020-03-30 11:38:06 UTC +--- build/BSD.inc.orig 2020-07-10 13:18:01 UTC +++ build/BSD.inc -@@ -22,17 +22,29 @@ ifndef arch +@@ -22,17 +22,32 @@ ifndef arch ifeq ($(shell uname -m),amd64) export arch:=intel64 endif + ifeq ($(shell uname -m),arm) + export arch:=armv7 + endif + ifeq ($(shell uname -m),arm64) + export arch:=arm64 + endif + ifeq ($(shell uname -p),powerpc64) + export arch:=powerpc64 + endif ++ ifeq ($(shell uname -p),powerpc64le) ++ export arch:=powerpc64le ++ endif + ifeq ($(shell uname -p),powerpc) + export arch:=powerpc + endif endif ifndef runtime - clang_version:=$(shell clang --version | sed -n "1s/.*version \(.*[0-9]\) .*/\1/p") + clang_version:=$(shell $(CC) -dumpversion) os_version:=$(shell uname -r) os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//') export runtime:=cc$(clang_version)_kernel$(os_kernel_version) endif -native_compiler := clang -export compiler ?= clang +native_compiler := $(CC) +export compiler ?= $(CC) debugger ?= gdb CMD=$(SHELL) -c -@@ -42,7 +54,7 @@ RD?=rmdir +@@ -42,7 +57,7 @@ RD?=rmdir MD?=mkdir -p NUL= /dev/null SLASH=/ -MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(VERSION_FLAGS) >version_string.ver +MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(VERSION_FLAGS) >version_string.ver MAKE_TBBVARS=sh $(tbb_root)/build/generate_tbbvars.sh ifdef LD_LIBRARY_PATH Index: head/devel/tbb/files/patch-build_FreeBSD.gcc.inc =================================================================== --- head/devel/tbb/files/patch-build_FreeBSD.gcc.inc (revision 552512) +++ head/devel/tbb/files/patch-build_FreeBSD.gcc.inc (revision 552513) @@ -1,28 +1,33 @@ ---- build/FreeBSD.gcc.inc.orig 2020-03-30 11:38:06 UTC +--- build/FreeBSD.gcc.inc.orig 2020-07-10 13:18:01 UTC +++ build/FreeBSD.gcc.inc @@ -26,7 +26,7 @@ WARNING_SUPPRESS = -Wno-parentheses CPLUS = g++ CONLY = gcc -LIB_LINK_FLAGS = -shared +LIB_LINK_FLAGS = -shared -Wl,-soname=$(BUILDING_LIBRARY) LIBS = -lpthread C_FLAGS = $(CPLUS_FLAGS) -@@ -58,6 +58,16 @@ endif +@@ -58,6 +58,21 @@ endif ifeq (intel64,$(arch)) CPLUS_FLAGS += -m64 LIB_LINK_FLAGS += -m64 +endif + +ifeq (powerpc64,$(arch)) ++ CPLUS_FLAGS += -m64 ++ LIB_LINK_FLAGS += -m64 ++endif ++ ++ifeq (powerpc64le,$(arch)) + CPLUS_FLAGS += -m64 + LIB_LINK_FLAGS += -m64 +endif + +ifeq (powerpc,$(arch)) + CPLUS_FLAGS += -m32 + LIB_LINK_FLAGS += -m32 endif ifeq (ia32,$(arch))