mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

tbb: Update to 2017 release

Browse Source 
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>
This commit is contained in:
Khem Raj
2017-03-06 23:13:42 -08:00
committed by Martin Jansa
parent e2975aee7c
commit 475ba851de
3 changed files with 33 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/tbb/tbb_4.1.bb → meta-oe/recipes-support/tbb/tbb.bb
+11 -12
View File
@@ -4,23 +4,22 @@ DESCRIPTION = "Parallelism library for C++ - runtime files \
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 \
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
PRDATE = "20170118"
PV = "${PRDATE}"
SRC_URI = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb2017_${PRDATE}oss_src.tgz \
file://cross-compile.patch \
file://allow-to-build-for-older-arm-cores.patch \
file://tbb.pc"
SRC_URI[md5sum] = "26baa6fbcc8f03ee45c0641b91d9588a"
SRC_URI[sha256sum] = "48bb526287fa8b4e7d1e1b2ba9e5fb9c3e372b497772c06ef9ccd7f93f344e74"
S = "${WORKDIR}/tbb41_${PRDATE}oss/"
SRC_URI[md5sum] = "ed4af7ccfa122f16cf9920b241633a3a"
SRC_URI[sha256sum] = "32fd5979971b772caa96d40646cee585ed0070516ba2dbbcb1f9b6033d08a92d"
S = "${WORKDIR}/tbb2017_${PRDATE}oss/"
COMPILER ?= "gcc"
COMPILER_toolchain-clang = "clang"
do_compile() {
oe_runmake compiler=gcc arch=${HOST_ARCH} runtime=cc4
oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4
}
do_install() {
meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch
-30
View File
@@ -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"
meta-oe/recipes-support/tbb/tbb/cross-compile.patch
+22 -8
View File
@@ -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