From: Francis Laniel <flaniel@linux.microsoft.com>
To: buildroot@buildroot.org
Cc: Francis Laniel <flaniel@linux.microsoft.com>
Subject: [Buildroot] [PATCH 1/1] package/tbb: bump to version 2021.8.0.
Date: Fri, 28 Apr 2023 11:44:03 +0100 [thread overview]
Message-ID: <20230428104403.10889-1-flaniel@linux.microsoft.com> (raw)
- Remove upstream patches as they are no more needed.
Signed-off-by: Francis Laniel <flaniel@linux.microsoft.com>
---
...Musl-linux-can-not-use-RTLD_DEEPBIND.patch | 33 ---------------
...is-only-defined-on-glibc-and-android.patch | 42 -------------------
...-Define-ITT_ARCH_IA64-when-undefiend.patch | 27 ------------
package/tbb/tbb.hash | 2 +-
package/tbb/tbb.mk | 2 +-
5 files changed, 2 insertions(+), 104 deletions(-)
delete mode 100644 package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch
delete mode 100644 package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch
delete mode 100644 package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch
diff --git a/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch b/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch
deleted file mode 100644
index 82182ce109..0000000000
--- a/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 883c2e5245c39624b3b5d6d56d5b203cf09eac38 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Dec 2021 08:08:07 -0800
-Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684)
-
-Exclude non-glibc linux systems along with android
-Fixes
-src/tbb/dynamic_link.cpp:417:29: error: use
- of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND;
-| ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-[Retrieved from:
-https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/tbb/dynamic_link.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
-index 3f1342503..5330d7107 100644
---- a/src/tbb/dynamic_link.cpp
-+++ b/src/tbb/dynamic_link.cpp
-@@ -413,7 +413,7 @@ namespace r1 {
- int flags = RTLD_NOW;
- if (local_binding) {
- flags = flags | RTLD_LOCAL;
--#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
-+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
- flags = flags | RTLD_DEEPBIND;
- #endif
- } else {
diff --git a/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch b/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch
deleted file mode 100644
index 9b397cac41..0000000000
--- a/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3a7f96db56cc9821055cbc769d3065db86b8b4c9 Mon Sep 17 00:00:00 2001
-From: Julien Voisin <jvoisin@users.noreply.github.com>
-Date: Mon, 7 Feb 2022 07:56:15 +0100
-Subject: [PATCH] mallinfo is only defined on glibc and android (#764)
-
-It currently prevents compilation under musl:
-
-```
-[ 90%] Building CXX object src/tbbmalloc_proxy/CMakeFiles/tbbmalloc_proxy.dir/proxy.cpp.o
-/__w/mimalloc-bench/mimalloc-bench/extern/tbb/src/tbbmalloc_proxy/proxy.cpp:263:26: error: return type 'struct mallinfo' is incomplete
- 263 | struct mallinfo mallinfo() __THROW
- | ^
-compilation terminated due to -Wfatal-errors.
-``
-
-[Retrieved from:
-https://github.com/oneapi-src/oneTBB/commit/3a7f96db56cc9821055cbc769d3065db86b8b4c9]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/tbbmalloc_proxy/proxy.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
-index e58e55e0b..23b9c19c1 100644
---- a/src/tbbmalloc_proxy/proxy.cpp
-+++ b/src/tbbmalloc_proxy/proxy.cpp
-@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW
- return 1;
- }
-
-+#if defined(__GLIBC__) || defined(__ANDROID__)
- struct mallinfo mallinfo() __THROW
- {
- struct mallinfo m;
-@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW
-
- return m;
- }
-+#endif
-
- #if __ANDROID__
- // Android doesn't have malloc_usable_size, provide it to be compatible
diff --git a/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch b/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch
deleted file mode 100644
index 5b7f002499..0000000000
--- a/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6fad69889da67bc4d4baff4afa94f77da45e006d Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Thu, 7 Oct 2021 14:16:16 +0800
-Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550)
-
-[Retrieved from:
-https://github.com/oneapi-src/oneTBB/commit/6fad69889da67bc4d4baff4afa94f77da45e006d]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/tbb/tools_api/ittnotify_config.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h
-index 8ecc23781..f904a8e9d 100644
---- a/src/tbb/tools_api/ittnotify_config.h
-+++ b/src/tbb/tools_api/ittnotify_config.h
-@@ -147,6 +147,10 @@
- # define ITT_ARCH_IA32E 2
- #endif /* ITT_ARCH_IA32E */
-
-+#ifndef ITT_ARCH_IA64
-+# define ITT_ARCH_IA64 3
-+#endif /* ITT_ARCH_IA64 */
-+
- #ifndef ITT_ARCH_ARM
- # define ITT_ARCH_ARM 4
- #endif /* ITT_ARCH_ARM */
diff --git a/package/tbb/tbb.hash b/package/tbb/tbb.hash
index 9992fb3c4f..579581cfe4 100644
--- a/package/tbb/tbb.hash
+++ b/package/tbb/tbb.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a tbb-2021.5.0.tar.gz
+sha256 eee380323bb7ce864355ed9431f85c43955faaae9e9bce35c62b372d7ffd9f8b tbb-2021.8.0.tar.gz
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt
diff --git a/package/tbb/tbb.mk b/package/tbb/tbb.mk
index fc720fd2f5..c3e06a4e6d 100644
--- a/package/tbb/tbb.mk
+++ b/package/tbb/tbb.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TBB_VERSION = 2021.5.0
+TBB_VERSION = 2021.8.0
TBB_SITE = $(call github,01org,tbb,v$(TBB_VERSION))
TBB_INSTALL_STAGING = YES
TBB_LICENSE = Apache-2.0
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2023-04-28 10:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 10:44 Francis Laniel [this message]
2023-05-01 7:25 ` [Buildroot] [PATCH 1/1] package/tbb: bump to version 2021.8.0 Peter Korsgaard
2023-05-02 9:18 ` Francis Laniel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230428104403.10889-1-flaniel@linux.microsoft.com \
--to=flaniel@linux.microsoft.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.