From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C285158087 for ; Sun, 16 Jan 2022 06:45:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FE602BC00D; Sun, 16 Jan 2022 06:45:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24E3D2BC00D for ; Sun, 16 Jan 2022 06:45:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D74B2342C41 for ; Sun, 16 Jan 2022 06:45:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4930B24E for ; Sun, 16 Jan 2022 06:45:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642315533.f3cd6cd18b7f54edfedbd0015b28ce20b4bbcba6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/, dev-cpp/tbb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch dev-cpp/tbb/tbb-2021.5.0.ebuild X-VCS-Directories: dev-cpp/tbb/ dev-cpp/tbb/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f3cd6cd18b7f54edfedbd0015b28ce20b4bbcba6 X-VCS-Branch: master Date: Sun, 16 Jan 2022 06:45:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e832ac8-2f04-4074-95d9-171c92e1c7fc X-Archives-Hash: 805b22e1a529849d5ddd817876e0cc38 commit: f3cd6cd18b7f54edfedbd0015b28ce20b4bbcba6 Author: Sam James gentoo org> AuthorDate: Sun Jan 16 06:45:33 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 16 06:45:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3cd6cd1 dev-cpp/tbb: fix build on musl Closes: https://bugs.gentoo.org/830698 Signed-off-by: Sam James gentoo.org> dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch | 25 ++++++++++++++++++++++ dev-cpp/tbb/tbb-2021.5.0.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch new file mode 100644 index 000000000000..014a3863f452 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch @@ -0,0 +1,25 @@ +https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38 +https://bugs.gentoo.org/830698 + +From: Khem Raj +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 +--- 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/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild index 0a18fece5fd1..2ab975036c65 100644 --- a/dev-cpp/tbb/tbb-2021.5.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild @@ -25,6 +25,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( # should be in.. 2022? "${FILESDIR}"/${PN}-2021.4.0-lto.patch + "${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch ) src_configure() {