diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-03-06 23:13:42 -0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-11 17:56:42 +0100 |
| commit | 475ba851dec91e854255204d8e54f3104a5350b8 (patch) | |
| tree | d9196b0b49856aa57f25e070dd7c873d03a95d18 /meta-oe/recipes-support/tbb/tbb | |
| parent | e2975aee7c89f87d42ca83d7f40bec5a35ccd9c4 (diff) | |
| download | meta-openembedded-475ba851dec91e854255204d8e54f3104a5350b8.tar.gz | |
tbb: Update to 2017 release
Update license to reflect new Apache 2.0 license
Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/tbb/tbb')
| -rw-r--r-- | meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/tbb/tbb/cross-compile.patch | 30 |
2 files changed, 22 insertions, 38 deletions
diff --git a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch b/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch deleted file mode 100644 index cd2ec9499c..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> -Description: Allow to build TBB for ARM cores older than ARMv7a - -| ../../include/tbb/machine/gcc_armv7.h:39:2: error: #error Threading -Building Blocks ARM port requires an ARMv7-a architecture. -| make[1]: *** [concurrent_hash_map.o] Error 1 - -https://bugs.launchpad.net/linaro-oe/+bug/1167144 - -Upstream-status: pending - ---- - include/tbb/tbb_machine.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- tbb41_20130314oss.orig/include/tbb/tbb_machine.h -+++ tbb41_20130314oss/include/tbb/tbb_machine.h -@@ -237,11 +237,11 @@ template<> struct atomic_selector<8> { - #include "machine/linux_intel64.h" - #elif __ia64__ - #include "machine/linux_ia64.h" - #elif __powerpc__ - #include "machine/mac_ppc.h" -- #elif __arm__ -+ #elif __ARM_ARCH_7A__ - #include "machine/gcc_armv7.h" - #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT - #include "machine/gcc_generic.h" - #endif - #include "machine/linux_common.h" diff --git a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch index b970a374e5..d54b307ee9 100644 --- a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch +++ b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch @@ -5,14 +5,14 @@ Upstream-Status: unsuitable build/linux.gcc.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---- tbb41_20121003oss.orig/build/linux.gcc.inc -+++ tbb41_20121003oss/build/linux.gcc.inc -@@ -40,12 +40,13 @@ DYLIB_KEY = -shared +Index: tbb2017_20170118oss/build/linux.gcc.inc +=================================================================== +--- tbb2017_20170118oss.orig/build/linux.gcc.inc ++++ tbb2017_20170118oss/build/linux.gcc.inc +@@ -32,8 +32,9 @@ DYLIB_KEY = -shared EXPORT_KEY = -Wl,--version-script, LIBDL = -ldl - TBB_NOSTRICT = 1 - -CPLUS = g++ -CONLY = gcc +CPLUS = $(CXX) @@ -20,6 +20,20 @@ Upstream-Status: unsuitable +CPLUS_FLAGS = $(CXXFLAGS) LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. - C_FLAGS = $(CPLUS_FLAGS) - # gcc 4.4 and higher support -std=c++0x + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic +Index: tbb2017_20170118oss/build/linux.clang.inc +=================================================================== +--- tbb2017_20170118oss.orig/build/linux.clang.inc ++++ tbb2017_20170118oss/build/linux.clang.inc +@@ -31,8 +31,9 @@ DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + +-CPLUS = clang++ +-CONLY = clang ++CPLUS = $(CXX) ++CONLY = $(CC) ++CPLUS_FLAGS = $(CXXFLAGS) + LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) + LIBS += -lpthread -lrt + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic |