diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/tbb')
4 files changed, 106 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch new file mode 100644 index 000000000..cd2ec9499 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch @@ -0,0 +1,30 @@ +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/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch new file mode 100644 index 000000000..b970a374e --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch @@ -0,0 +1,25 @@ +Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + +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 + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + + TBB_NOSTRICT = 1 + +-CPLUS = g++ +-CONLY = gcc ++CPLUS = $(CXX) ++CONLY = $(CC) ++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 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc new file mode 100644 index 000000000..644b64fbf --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Threading Building Blocks +Description: Intel's parallelism library for C++ +URL: http://www.threadingbuildingblocks.org/ +Version: 3.0+r018 +Libs: -L${libdir} -ltbb +Cflags: -I${includedir} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb_4.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb_4.1.bb new file mode 100644 index 000000000..09ed6ec52 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb_4.1.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Parallelism library for C++ - runtime files \ + TBB is a library that helps you leverage multi-core processor \ + performance without having to be a threading expert. It represents a \ + higher-level, task-based parallelism that abstracts platform details \ + and threading mechanism for performance and scalability." +HOMEPAGE = "http://threadingbuildingblocks.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1" +PRDATE = "20130314" +PR = "r${PRDATE}" + +SRC_URI = "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_${PRDATE}oss_src.tgz \ + file://cross-compile.patch \ + file://allow-to-build-for-older-arm-cores.patch \ + file://tbb.pc" + +S = "${WORKDIR}/tbb41_${PRDATE}oss/" + +SRC_URI[md5sum] = "ed4af7ccfa122f16cf9920b241633a3a" +SRC_URI[sha256sum] = "32fd5979971b772caa96d40646cee585ed0070516ba2dbbcb1f9b6033d08a92d" + +do_compile() { + oe_runmake compiler=gcc arch=${HOST_ARCH} runtime=cc4 +} + +do_install() { + install -d ${D}${includedir} ${D}${libdir}/pkgconfig + rm ${S}/include/tbb/index.html -f + cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} + install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir} + install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig +} + +# fails with thumb enabled: +# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp +# | {standard input}: Assembler messages: +# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' +# ... +# | make[1]: *** [concurrent_queue.o] Error 1 +ARM_INSTRUCTION_SET = "arm" |
