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/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch | |
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/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch')
-rw-r--r-- | meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch | 37 |
1 files changed, 37 insertions, 0 deletions
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 0000000000..7e66945fa2 --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch @@ -0,0 +1,37 @@ +From 6b2b136caa68912d77ffe26143cd3da768b9ef80 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Jun 2017 08:39:37 -0700 +Subject: [PATCH] mallinfo() is glibc specific API mark it so + +Helps compiling with musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/tbbmalloc/proxy.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp +index 5ef279d..06c4872 100644 +--- a/src/tbbmalloc/proxy.cpp ++++ b/src/tbbmalloc/proxy.cpp +@@ -185,6 +185,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW + return 1; + } + ++#ifdef __GLIBC__ + struct mallinfo mallinfo() __THROW + { + struct mallinfo m; +@@ -192,6 +193,7 @@ struct mallinfo mallinfo() __THROW + + return m; + } ++#endif + + #if __ANDROID__ + // Android doesn't have malloc_usable_size, provide it to be compatible +-- +2.13.0 + |