diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-06-06 07:50:26 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-12 06:56:45 +0200 |
commit | 637470014f5a5e7c7ba48db9f738516268ed5566 (patch) | |
tree | d0adad37845478ca227898ee833f9894d0f42dae /meta-oe | |
parent | cf08f81e53b5d9256aeeef72b009736bf4741ee2 (diff) | |
download | meta-openembedded-637470014f5a5e7c7ba48db9f738516268ed5566.tar.gz |
tbb: Update to 2017 Update 6
Fix build with musl and security flags turned on
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/tbb/tbb.bb | 19 | ||||
-rw-r--r-- | meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch | 37 |
2 files changed, 49 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/tbb/tbb.bb b/meta-oe/recipes-support/tbb/tbb.bb index d8eb1c2f3..bad9481f7 100644 --- a/meta-oe/recipes-support/tbb/tbb.bb +++ b/meta-oe/recipes-support/tbb/tbb.bb | |||
@@ -6,18 +6,21 @@ DESCRIPTION = "Parallelism library for C++ - runtime files \ | |||
6 | HOMEPAGE = "http://threadingbuildingblocks.org/" | 6 | HOMEPAGE = "http://threadingbuildingblocks.org/" |
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
9 | PRDATE = "20170118" | 9 | PRDATE = "20170412" |
10 | PV = "${PRDATE}" | 10 | BRANCH = "tbb_2017" |
11 | SRC_URI = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb2017_${PRDATE}oss_src.tgz \ | 11 | SRCREV = "a2cfdfe946933cbe38bffe1d8086ae36f06691a3" |
12 | PV = "${PRDATE}+${SRCPV}" | ||
13 | SRC_URI = "git://github.com/01org/tbb;branch=${BRANCH} \ | ||
12 | file://cross-compile.patch \ | 14 | file://cross-compile.patch \ |
13 | file://tbb.pc" | 15 | file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ |
14 | SRC_URI[md5sum] = "26baa6fbcc8f03ee45c0641b91d9588a" | 16 | file://tbb.pc \ |
15 | SRC_URI[sha256sum] = "48bb526287fa8b4e7d1e1b2ba9e5fb9c3e372b497772c06ef9ccd7f93f344e74" | 17 | " |
16 | 18 | ||
17 | S = "${WORKDIR}/tbb2017_${PRDATE}oss/" | 19 | S = "${WORKDIR}/git" |
18 | 20 | ||
19 | COMPILER ?= "gcc" | 21 | COMPILER ?= "gcc" |
20 | COMPILER_toolchain-clang = "clang" | 22 | COMPILER_toolchain-clang = "clang" |
23 | |||
21 | do_compile() { | 24 | do_compile() { |
22 | oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4 | 25 | oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4 |
23 | } | 26 | } |
@@ -37,3 +40,5 @@ do_install() { | |||
37 | # ... | 40 | # ... |
38 | # | make[1]: *** [concurrent_queue.o] Error 1 | 41 | # | make[1]: *** [concurrent_queue.o] Error 1 |
39 | ARM_INSTRUCTION_SET = "arm" | 42 | ARM_INSTRUCTION_SET = "arm" |
43 | SECURITY_CFLAGS_append = " -fPIC" | ||
44 | |||
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch b/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch new file mode 100644 index 000000000..7e66945fa --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 6b2b136caa68912d77ffe26143cd3da768b9ef80 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 3 Jun 2017 08:39:37 -0700 | ||
4 | Subject: [PATCH] mallinfo() is glibc specific API mark it so | ||
5 | |||
6 | Helps compiling with musl | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | src/tbbmalloc/proxy.cpp | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp | ||
16 | index 5ef279d..06c4872 100644 | ||
17 | --- a/src/tbbmalloc/proxy.cpp | ||
18 | +++ b/src/tbbmalloc/proxy.cpp | ||
19 | @@ -185,6 +185,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW | ||
20 | return 1; | ||
21 | } | ||
22 | |||
23 | +#ifdef __GLIBC__ | ||
24 | struct mallinfo mallinfo() __THROW | ||
25 | { | ||
26 | struct mallinfo m; | ||
27 | @@ -192,6 +193,7 @@ struct mallinfo mallinfo() __THROW | ||
28 | |||
29 | return m; | ||
30 | } | ||
31 | +#endif | ||
32 | |||
33 | #if __ANDROID__ | ||
34 | // Android doesn't have malloc_usable_size, provide it to be compatible | ||
35 | -- | ||
36 | 2.13.0 | ||
37 | |||