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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C47815813A for ; Fri, 17 Jan 2025 09:41:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA8E8E091D; Fri, 17 Jan 2025 09:41:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11276E091D for ; Fri, 17 Jan 2025 09:41:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 97E2B3431B2 for ; Fri, 17 Jan 2025 09:41:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 079532609 for ; Fri, 17 Jan 2025 09:41:37 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1736970809.1e8cb85c79c4feabd23e999cda27c1cfbdb90cc9.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/swift/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lang/swift/swift-6.0.1-r1.ebuild dev-lang/swift/swift-6.0.1.ebuild dev-lang/swift/swift-6.0.2.ebuild dev-lang/swift/swift-6.0.3.ebuild X-VCS-Directories: dev-lang/swift/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 1e8cb85c79c4feabd23e999cda27c1cfbdb90cc9 X-VCS-Branch: master Date: Fri, 17 Jan 2025 09:41:37 +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: e61f7a12-f2d3-43d4-8a00-332abd761e62 X-Archives-Hash: af7d78b6dbd2546aa89d8539152362d8 commit: 1e8cb85c79c4feabd23e999cda27c1cfbdb90cc9 Author: Itai Ferber itaiferber net> AuthorDate: Wed Jan 15 19:50:17 2025 +0000 Commit: David Roman gmail com> CommitDate: Wed Jan 15 19:53:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1e8cb85c dev-lang/swift: remove dev-cpp/tbb as a strong blocker for Swift 6 Swift 6 builds with `dev-cpp/tbb` installed on systems with >=libstdc++-11 (the minimum version currently supported by Gentoo) as long as it's bootstrapped by swift-5.10.1-r3 or later (which has a patch backported from Swift 6 which prevents `` from getting picked up). Bug: https://bugs.gentoo.org/947141 Signed-off-by: Itai Ferber itaiferber.net> dev-lang/swift/swift-6.0.1-r1.ebuild | 13 +------------ dev-lang/swift/swift-6.0.1.ebuild | 13 +------------ dev-lang/swift/swift-6.0.2.ebuild | 13 +------------ dev-lang/swift/swift-6.0.3.ebuild | 13 +------------ 4 files changed, 4 insertions(+), 48 deletions(-) diff --git a/dev-lang/swift/swift-6.0.1-r1.ebuild b/dev-lang/swift/swift-6.0.1-r1.ebuild index 86dc9abab..672e8c12a 100644 --- a/dev-lang/swift/swift-6.0.1-r1.ebuild +++ b/dev-lang/swift/swift-6.0.1-r1.ebuild @@ -93,6 +93,7 @@ BDEPEND=" >=dev-util/patchelf-0.18 >=dev-vcs/git-2.39 >=sys-apps/coreutils-9 + >=sys-devel/gcc-11 >=sys-libs/ncurses-6 >=sys-libs/zlib-1.3 || ( @@ -109,18 +110,6 @@ BDEPEND=" ' python3_{12..13}) " -# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's -# `libstdcxx.h` includes ``, which, in combination with recent -# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in -# a circular dependency back on the stdlib, failing the build. -# -# See: -# * https://bugs.gentoo.org/947141 -# * https://github.com/swiftlang/swift/issues/76166 -BDEPEND+=" - !!dev-cpp/tbb -" - # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`). clang-ldflags() { diff --git a/dev-lang/swift/swift-6.0.1.ebuild b/dev-lang/swift/swift-6.0.1.ebuild index 085c043de..630ea1e18 100644 --- a/dev-lang/swift/swift-6.0.1.ebuild +++ b/dev-lang/swift/swift-6.0.1.ebuild @@ -92,6 +92,7 @@ BDEPEND=" >=dev-util/patchelf-0.18 >=dev-vcs/git-2.39 >=sys-apps/coreutils-9 + >=sys-devel/gcc-11 >=sys-libs/ncurses-6 >=sys-libs/zlib-1.3 || ( @@ -108,18 +109,6 @@ BDEPEND=" ' python3_{12..13}) " -# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's -# `libstdcxx.h` includes ``, which, in combination with recent -# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in -# a circular dependency back on the stdlib, failing the build. -# -# See: -# * https://bugs.gentoo.org/947141 -# * https://github.com/swiftlang/swift/issues/76166 -BDEPEND+=" - !!dev-cpp/tbb -" - # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`). clang-ldflags() { diff --git a/dev-lang/swift/swift-6.0.2.ebuild b/dev-lang/swift/swift-6.0.2.ebuild index 86dc9abab..672e8c12a 100644 --- a/dev-lang/swift/swift-6.0.2.ebuild +++ b/dev-lang/swift/swift-6.0.2.ebuild @@ -93,6 +93,7 @@ BDEPEND=" >=dev-util/patchelf-0.18 >=dev-vcs/git-2.39 >=sys-apps/coreutils-9 + >=sys-devel/gcc-11 >=sys-libs/ncurses-6 >=sys-libs/zlib-1.3 || ( @@ -109,18 +110,6 @@ BDEPEND=" ' python3_{12..13}) " -# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's -# `libstdcxx.h` includes ``, which, in combination with recent -# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in -# a circular dependency back on the stdlib, failing the build. -# -# See: -# * https://bugs.gentoo.org/947141 -# * https://github.com/swiftlang/swift/issues/76166 -BDEPEND+=" - !!dev-cpp/tbb -" - # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`). clang-ldflags() { diff --git a/dev-lang/swift/swift-6.0.3.ebuild b/dev-lang/swift/swift-6.0.3.ebuild index 86dc9abab..672e8c12a 100644 --- a/dev-lang/swift/swift-6.0.3.ebuild +++ b/dev-lang/swift/swift-6.0.3.ebuild @@ -93,6 +93,7 @@ BDEPEND=" >=dev-util/patchelf-0.18 >=dev-vcs/git-2.39 >=sys-apps/coreutils-9 + >=sys-devel/gcc-11 >=sys-libs/ncurses-6 >=sys-libs/zlib-1.3 || ( @@ -109,18 +110,6 @@ BDEPEND=" ' python3_{12..13}) " -# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's -# `libstdcxx.h` includes ``, which, in combination with recent -# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in -# a circular dependency back on the stdlib, failing the build. -# -# See: -# * https://bugs.gentoo.org/947141 -# * https://github.com/swiftlang/swift/issues/76166 -BDEPEND+=" - !!dev-cpp/tbb -" - # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`). clang-ldflags() {