public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/
Date: Sun, 28 Jan 2024 22:14:41 +0000 (UTC)	[thread overview]
Message-ID: <1706480021.02d9351d758b8e0e604e347f6068bcbb3c8f8f03.sam@gentoo> (raw)

commit:     02d9351d758b8e0e604e347f6068bcbb3c8f8f03
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Sat Jan 27 19:49:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 22:13:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d9351d

dev-cpp/tbb: fix build with ld.lld (error: version script assignment of 'local' to symbol ...)

Closes: https://bugs.gentoo.org/912210
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35048
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/tbb/tbb-2020.3.ebuild      |  7 +++++--
 dev-cpp/tbb/tbb-2021.10.0.ebuild   |  7 +++++--
 dev-cpp/tbb/tbb-2021.11.0.ebuild   |  7 +++++--
 dev-cpp/tbb/tbb-2021.5.0-r1.ebuild | 10 ++++++++--
 dev-cpp/tbb/tbb-2021.7.0-r1.ebuild |  7 +++++--
 dev-cpp/tbb/tbb-2021.7.0.ebuild    |  5 ++++-
 dev-cpp/tbb/tbb-2021.8.0.ebuild    |  7 +++++--
 dev-cpp/tbb/tbb-2021.9.0.ebuild    |  7 +++++--
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index 27479b3e46af..36dc24e44018 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal multilib toolchain-funcs
+inherit flag-o-matic multilib-minimal multilib multibuild toolchain-funcs
 
 PV1="$(ver_cut 1)"
 PV2="$(ver_cut 2)"
@@ -40,6 +40,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	# pc files are for debian and fedora compatibility
 	# some deps use them
 	cat <<-EOF > ${PN}.pc.template

diff --git a/dev-cpp/tbb/tbb-2021.10.0.ebuild b/dev-cpp/tbb/tbb-2021.10.0.ebuild
index 2e11233b7583..3d0e05e45514 100644
--- a/dev-cpp/tbb/tbb-2021.10.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://github.com/oneapi-src/oneTBB"
@@ -27,6 +27,9 @@ PATCHES=(
 )
 
 src_prepare() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	# Has an #error to force compilation as C but links with C++ library, dies
 	# with GLIBCXX_ASSERTIONS as a result.
 	sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die

diff --git a/dev-cpp/tbb/tbb-2021.11.0.ebuild b/dev-cpp/tbb/tbb-2021.11.0.ebuild
index 2e11233b7583..3ac69c080835 100644
--- a/dev-cpp/tbb/tbb-2021.11.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://github.com/oneapi-src/oneTBB"
@@ -35,6 +35,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local mycmakeargs=(
 		-DTBB_TEST=$(usex test)
 		-DTBB_ENABLE_IPO=OFF

diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index edfd4bd37ec7..adb066b4c2d9 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://github.com/oneapi-src/oneTBB"
@@ -39,6 +39,12 @@ PATCHES=(
 )
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local mycmakeargs=(
 		-DTBB_TEST=$(usex test)
 		-DTBB_ENABLE_IPO=OFF

diff --git a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
index 4263e849f7d0..dd9c26717c7e 100644
--- a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://github.com/oneapi-src/oneTBB"
@@ -27,6 +27,9 @@ PATCHES=(
 )
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local mycmakeargs=(
 		-DTBB_TEST=$(usex test)
 		-DTBB_ENABLE_IPO=OFF

diff --git a/dev-cpp/tbb/tbb-2021.7.0.ebuild b/dev-cpp/tbb/tbb-2021.7.0.ebuild
index 5f2737037ddb..972e90e1702f 100644
--- a/dev-cpp/tbb/tbb-2021.7.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	# bug #872287
 	filter-flags -D_GLIBCXX_ASSERTIONS
 	append-cppflags -U_GLIBCXX_ASSERTIONS

diff --git a/dev-cpp/tbb/tbb-2021.8.0.ebuild b/dev-cpp/tbb/tbb-2021.8.0.ebuild
index 7fdc1d716762..9b77bc83b8e5 100644
--- a/dev-cpp/tbb/tbb-2021.8.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://github.com/oneapi-src/oneTBB"
@@ -36,6 +36,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local mycmakeargs=(
 		-DTBB_TEST=$(usex test)
 		-DTBB_ENABLE_IPO=OFF

diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 2e24080c2a1e..2a0013ba8bb3 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://github.com/oneapi-src/oneTBB"
@@ -35,6 +35,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Workaround for bug #912210
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local mycmakeargs=(
 		-DTBB_TEST=$(usex test)
 		-DTBB_ENABLE_IPO=OFF


             reply	other threads:[~2024-01-28 22:14 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-28 22:14 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-23 15:28 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/ Fabian Groffen
2024-07-20 21:44 James Le Cuirot
2024-07-14 22:39 James Le Cuirot
2024-04-19 12:24 Sam James
2023-12-04 10:52 Sam James
2023-07-26  4:08 Sam James
2023-06-09 17:22 Arthur Zamarin
2023-06-09 16:43 Arthur Zamarin
2023-06-09 16:13 Arthur Zamarin
2023-06-09 14:38 Sam James
2023-04-15  2:10 Sam James
2023-01-13 12:37 Arthur Zamarin
2023-01-05  4:38 Sam James
2023-01-05  4:38 Sam James
2023-01-05  4:38 Sam James
2023-01-05  4:38 Sam James
2023-01-05  4:38 Sam James
2022-12-03  4:47 WANG Xuerui
2022-11-25 12:08 Arthur Zamarin
2022-11-25 12:05 Arthur Zamarin
2022-11-23 17:33 Andrew Ammerlaan
2022-11-23 14:12 Jakov Smolić
2022-11-22 20:16 Sam James
2022-11-19  4:03 Sam James
2022-11-19  4:03 Sam James
2022-11-19  3:34 Sam James
2022-10-10 20:39 Sam James
2022-10-10 18:34 Sam James
2022-09-22  5:48 Sam James
2022-07-03  7:06 Fabian Groffen
2022-05-19 13:36 Agostino Sarubbo
2022-05-19  9:29 Agostino Sarubbo
2022-05-16 12:51 Agostino Sarubbo
2022-05-13 20:09 Jakov Smolić
2022-03-21 15:20 Agostino Sarubbo
2022-01-02 22:49 Sam James
2022-01-02 22:42 Sam James
2022-01-02 22:32 Sam James
2021-10-06  8:33 Jakov Smolić
2021-07-14 16:15 Marek Szuba
2021-01-07 16:52 Sam James
2021-01-07 10:09 Sam James
2021-01-06  8:09 Sam James
2021-01-06  8:09 Sam James
2020-07-15 22:28 Guilherme Amadio
2020-04-16 15:10 Agostino Sarubbo
2020-04-15 12:15 Guilherme Amadio
2020-04-15 12:15 Guilherme Amadio
2020-04-01  8:51 Guilherme Amadio
2020-03-21 15:53 Agostino Sarubbo
2020-03-20 11:29 Agostino Sarubbo
2020-03-20  9:04 Agostino Sarubbo
2020-03-20  8:59 Agostino Sarubbo
2019-10-03  9:34 Guilherme Amadio
2019-08-16 14:35 Guilherme Amadio
2019-08-16 14:35 Guilherme Amadio
2019-08-16 14:35 Guilherme Amadio
2019-05-16 19:30 Aaron Bauman
2019-05-07 19:39 Michał Górny
2018-05-16 22:57 Aaron Bauman
2018-04-24 15:58 Matthias Maier
2018-04-19 12:37 Amy Liffey
2017-12-29 13:35 Fabian Groffen
2017-11-27 19:46 Sergei Trofimovich
2017-07-08 10:51 Alexis Ballier
2017-07-01  9:52 Sergei Trofimovich
2017-04-29 12:38 Jeroen Roovers
2017-03-31 12:09 Agostino Sarubbo
2017-03-31  8:52 Michael Weber
2017-03-31  2:20 Matthias Maier
2017-03-31  2:16 Matthias Maier
2017-03-31  2:16 Matthias Maier
2016-06-07 16:47 Tobias Klausmann
2015-11-26 10:36 Justin Lecher
2015-11-08 17:47 Justin Lecher
2015-09-23 13:04 Justin Lecher
2015-09-20  8:32 Jeroen Roovers
2015-09-06 12:43 Agostino Sarubbo

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=1706480021.02d9351d758b8e0e604e347f6068bcbb3c8f8f03.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox