diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-support/tbb/tbb | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.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 | 25 | ||||
-rw-r--r-- | meta-oe/recipes-support/tbb/tbb/tbb.pc | 11 |
3 files changed, 66 insertions, 0 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 new file mode 100644 index 000000000..cd2ec9499 --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
2 | Description: Allow to build TBB for ARM cores older than ARMv7a | ||
3 | |||
4 | | ../../include/tbb/machine/gcc_armv7.h:39:2: error: #error Threading | ||
5 | Building Blocks ARM port requires an ARMv7-a architecture. | ||
6 | | make[1]: *** [concurrent_hash_map.o] Error 1 | ||
7 | |||
8 | https://bugs.launchpad.net/linaro-oe/+bug/1167144 | ||
9 | |||
10 | Upstream-status: pending | ||
11 | |||
12 | --- | ||
13 | include/tbb/tbb_machine.h | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | --- tbb41_20130314oss.orig/include/tbb/tbb_machine.h | ||
17 | +++ tbb41_20130314oss/include/tbb/tbb_machine.h | ||
18 | @@ -237,11 +237,11 @@ template<> struct atomic_selector<8> { | ||
19 | #include "machine/linux_intel64.h" | ||
20 | #elif __ia64__ | ||
21 | #include "machine/linux_ia64.h" | ||
22 | #elif __powerpc__ | ||
23 | #include "machine/mac_ppc.h" | ||
24 | - #elif __arm__ | ||
25 | + #elif __ARM_ARCH_7A__ | ||
26 | #include "machine/gcc_armv7.h" | ||
27 | #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT | ||
28 | #include "machine/gcc_generic.h" | ||
29 | #endif | ||
30 | #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 new file mode 100644 index 000000000..b970a374e --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
2 | |||
3 | Upstream-Status: unsuitable | ||
4 | --- | ||
5 | build/linux.gcc.inc | 5 +++-- | ||
6 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
7 | |||
8 | --- tbb41_20121003oss.orig/build/linux.gcc.inc | ||
9 | +++ tbb41_20121003oss/build/linux.gcc.inc | ||
10 | @@ -40,12 +40,13 @@ DYLIB_KEY = -shared | ||
11 | EXPORT_KEY = -Wl,--version-script, | ||
12 | LIBDL = -ldl | ||
13 | |||
14 | TBB_NOSTRICT = 1 | ||
15 | |||
16 | -CPLUS = g++ | ||
17 | -CONLY = gcc | ||
18 | +CPLUS = $(CXX) | ||
19 | +CONLY = $(CC) | ||
20 | +CPLUS_FLAGS = $(CXXFLAGS) | ||
21 | LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) | ||
22 | LIBS += -lpthread -lrt | ||
23 | LINK_FLAGS = -Wl,-rpath-link=. | ||
24 | C_FLAGS = $(CPLUS_FLAGS) | ||
25 | # gcc 4.4 and higher support -std=c++0x | ||
diff --git a/meta-oe/recipes-support/tbb/tbb/tbb.pc b/meta-oe/recipes-support/tbb/tbb/tbb.pc new file mode 100644 index 000000000..644b64fbf --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/tbb.pc | |||
@@ -0,0 +1,11 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=${exec_prefix}/lib | ||
4 | includedir=${prefix}/include | ||
5 | |||
6 | Name: Threading Building Blocks | ||
7 | Description: Intel's parallelism library for C++ | ||
8 | URL: http://www.threadingbuildingblocks.org/ | ||
9 | Version: 3.0+r018 | ||
10 | Libs: -L${libdir} -ltbb | ||
11 | Cflags: -I${includedir} | ||