commit: bcc4ae9994b2d546421cc894b8804926676d87f4 Author: Itai Ferber <itai <AT> itaiferber <DOT> net> AuthorDate: Thu Oct 31 02:12:49 2024 +0000 Commit: Itai Ferber <itai <AT> itaiferber <DOT> net> CommitDate: Thu Oct 31 15:11:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bcc4ae99
dev-lang/swift: add 5.10.1-r2 * Enables backtracing on Swift program abort * Disables unconditional `-Werror` in swift-corelibs-libdispatch Closes: https://bugs.gentoo.org/941508 Closes: https://bugs.gentoo.org/941509 Signed-off-by: Itai Ferber <itai <AT> itaiferber.net> .../files/swift-5.10.1-r2/backtracing-noexecstack.patch | 1 + .../files/swift-5.10.1-r2/disable-libdispatch-werror.patch | 12 ++++++++++++ .../swift/files/swift-5.10.1-r2/link-ncurses-tinfo.patch | 1 + dev-lang/swift/files/swift-5.10.1-r2/link-with-lld.patch | 1 + .../files/swift-5.10.1-r2/lldb-cmake-minimum-version.patch | 1 + dev-lang/swift/swift-5.10.1-r1.ebuild | 2 +- .../swift/{swift-5.10.1-r1.ebuild => swift-5.10.1-r2.ebuild} | 7 +++---- dev-lang/swift/swift-5.10.1.ebuild | 2 +- 8 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dev-lang/swift/files/swift-5.10.1-r2/backtracing-noexecstack.patch b/dev-lang/swift/files/swift-5.10.1-r2/backtracing-noexecstack.patch new file mode 120000 index 000000000..58b20ae89 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r2/backtracing-noexecstack.patch @@ -0,0 +1 @@ +../swift-6.0.1/backtracing-noexecstack.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-5.10.1-r2/disable-libdispatch-werror.patch b/dev-lang/swift/files/swift-5.10.1-r2/disable-libdispatch-werror.patch new file mode 100644 index 000000000..f05c04e57 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r2/disable-libdispatch-werror.patch @@ -0,0 +1,12 @@ +# Packages should not have `-Werror` unconditionally enabled. + +--- a/swift-corelibs-libdispatch/cmake/modules/DispatchCompilerWarnings.cmake ++++ b/swift-corelibs-libdispatch/cmake/modules/DispatchCompilerWarnings.cmake +@@ -2,7 +2,6 @@ + if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") + # TODO: someone needs to provide the msvc equivalent warning flags + else() +- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>) + add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>) + add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>) + diff --git a/dev-lang/swift/files/swift-5.10.1-r2/link-ncurses-tinfo.patch b/dev-lang/swift/files/swift-5.10.1-r2/link-ncurses-tinfo.patch new file mode 120000 index 000000000..bc80c967a --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r2/link-ncurses-tinfo.patch @@ -0,0 +1 @@ +../swift-5.10.1/link-ncurses-tinfo.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-5.10.1-r2/link-with-lld.patch b/dev-lang/swift/files/swift-5.10.1-r2/link-with-lld.patch new file mode 120000 index 000000000..daf9eebb1 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r2/link-with-lld.patch @@ -0,0 +1 @@ +../swift-5.10.1/link-with-lld.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-5.10.1-r2/lldb-cmake-minimum-version.patch b/dev-lang/swift/files/swift-5.10.1-r2/lldb-cmake-minimum-version.patch new file mode 120000 index 000000000..b0161946b --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r2/lldb-cmake-minimum-version.patch @@ -0,0 +1 @@ +../swift-5.10.1/lldb-cmake-minimum-version.patch \ No newline at end of file diff --git a/dev-lang/swift/swift-5.10.1-r1.ebuild b/dev-lang/swift/swift-5.10.1-r1.ebuild index a1a0e9da1..836a5dba4 100644 --- a/dev-lang/swift/swift-5.10.1-r1.ebuild +++ b/dev-lang/swift/swift-5.10.1-r1.ebuild @@ -16,7 +16,6 @@ SRC_URI=" https://github.com/apple/swift-atomics/archive/refs/tags/1.0.2.tar.gz -> swift-atomics-1.0.2.tar.gz https://github.com/apple/swift-certificates/archive/refs/tags/1.0.1.tar.gz -> swift-certificates-1.0.1.tar.gz https://github.com/apple/swift-collections/archive/refs/tags/1.0.5.tar.gz -> swift-collections-1.0.5.tar.gz - https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-libdispatch-${PV}.tar.gz https://github.com/apple/swift-crypto/archive/refs/tags/3.0.0.tar.gz -> swift-crypto-3.0.0.tar.gz https://github.com/apple/swift-nio-ssl/archive/refs/tags/2.15.0.tar.gz -> swift-nio-ssl-2.15.0.tar.gz https://github.com/apple/swift-nio/archive/refs/tags/2.31.2.tar.gz -> swift-nio-2.31.2.tar.gz @@ -29,6 +28,7 @@ SRC_URI=" https://github.com/swiftlang/sourcekit-lsp/archive/refs/tags/${P}-RELEASE.tar.gz -> sourcekit-lsp-${PV}.tar.gz https://github.com/swiftlang/swift-cmark/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-cmark-${PV}.tar.gz https://github.com/swiftlang/swift-corelibs-foundation/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-foundation-${PV}.tar.gz + https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-libdispatch-${PV}.tar.gz https://github.com/swiftlang/swift-corelibs-xctest/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-xctest-${PV}.tar.gz https://github.com/swiftlang/swift-docc-render-artifact/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-docc-render-artifact-${PV}.tar.gz https://github.com/swiftlang/swift-docc-symbolkit/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-docc-symbolkit-${PV}.tar.gz diff --git a/dev-lang/swift/swift-5.10.1-r1.ebuild b/dev-lang/swift/swift-5.10.1-r2.ebuild similarity index 98% copy from dev-lang/swift/swift-5.10.1-r1.ebuild copy to dev-lang/swift/swift-5.10.1-r2.ebuild index a1a0e9da1..a5ffbd7bc 100644 --- a/dev-lang/swift/swift-5.10.1-r1.ebuild +++ b/dev-lang/swift/swift-5.10.1-r2.ebuild @@ -16,7 +16,6 @@ SRC_URI=" https://github.com/apple/swift-atomics/archive/refs/tags/1.0.2.tar.gz -> swift-atomics-1.0.2.tar.gz https://github.com/apple/swift-certificates/archive/refs/tags/1.0.1.tar.gz -> swift-certificates-1.0.1.tar.gz https://github.com/apple/swift-collections/archive/refs/tags/1.0.5.tar.gz -> swift-collections-1.0.5.tar.gz - https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-libdispatch-${PV}.tar.gz https://github.com/apple/swift-crypto/archive/refs/tags/3.0.0.tar.gz -> swift-crypto-3.0.0.tar.gz https://github.com/apple/swift-nio-ssl/archive/refs/tags/2.15.0.tar.gz -> swift-nio-ssl-2.15.0.tar.gz https://github.com/apple/swift-nio/archive/refs/tags/2.31.2.tar.gz -> swift-nio-2.31.2.tar.gz @@ -29,6 +28,7 @@ SRC_URI=" https://github.com/swiftlang/sourcekit-lsp/archive/refs/tags/${P}-RELEASE.tar.gz -> sourcekit-lsp-${PV}.tar.gz https://github.com/swiftlang/swift-cmark/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-cmark-${PV}.tar.gz https://github.com/swiftlang/swift-corelibs-foundation/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-foundation-${PV}.tar.gz + https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-libdispatch-${PV}.tar.gz https://github.com/swiftlang/swift-corelibs-xctest/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-xctest-${PV}.tar.gz https://github.com/swiftlang/swift-docc-render-artifact/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-docc-render-artifact-${PV}.tar.gz https://github.com/swiftlang/swift-docc-symbolkit/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-docc-symbolkit-${PV}.tar.gz @@ -50,6 +50,8 @@ SRC_URI=" " PATCHES=( + "${FILESDIR}/${PF}/backtracing-noexecstack.patch" + "${FILESDIR}/${PF}/disable-libdispatch-werror.patch" "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/lldb-cmake-minimum-version.patch" @@ -227,7 +229,6 @@ src_compile() { --install-destdir="${S}/stage0" \ --extra-cmake-options="${extra_cmake_options}" \ --bootstrapping=off \ - --build-swift-libexec=false \ --llvm-install-components='llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file' \ --llvm-targets-to-build=host \ --skip-build-benchmarks \ @@ -251,7 +252,6 @@ src_compile() { --build-subdir="Ninja-Release" \ --install-destdir="${S}/stage1" \ --extra-cmake-options="${extra_cmake_options}" \ - --build-swift-libexec=false \ --cmark --skip-test-cmark \ --foundation --skip-test-foundation \ --libdispatch --skip-test-libdispatch \ @@ -275,7 +275,6 @@ src_compile() { --build-subdir="Ninja-Release" \ --install-destdir="${S}/stage2" \ --extra-cmake-options="${extra_cmake_options}" \ - --build-swift-libexec=false \ --foundation --skip-test-foundation \ --indexstore-db --skip-test-indexstore-db \ --libdispatch --skip-test-libdispatch \ diff --git a/dev-lang/swift/swift-5.10.1.ebuild b/dev-lang/swift/swift-5.10.1.ebuild index 0e335fd68..a7e882f9f 100644 --- a/dev-lang/swift/swift-5.10.1.ebuild +++ b/dev-lang/swift/swift-5.10.1.ebuild @@ -15,7 +15,6 @@ SRC_URI=" https://github.com/apple/swift-atomics/archive/refs/tags/1.0.2.tar.gz -> swift-atomics-1.0.2.tar.gz https://github.com/apple/swift-certificates/archive/refs/tags/1.0.1.tar.gz -> swift-certificates-1.0.1.tar.gz https://github.com/apple/swift-collections/archive/refs/tags/1.0.5.tar.gz -> swift-collections-1.0.5.tar.gz - https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-libdispatch-${PV}.tar.gz https://github.com/apple/swift-crypto/archive/refs/tags/3.0.0.tar.gz -> swift-crypto-3.0.0.tar.gz https://github.com/apple/swift-nio-ssl/archive/refs/tags/2.15.0.tar.gz -> swift-nio-ssl-2.15.0.tar.gz https://github.com/apple/swift-nio/archive/refs/tags/2.31.2.tar.gz -> swift-nio-2.31.2.tar.gz @@ -28,6 +27,7 @@ SRC_URI=" https://github.com/swiftlang/sourcekit-lsp/archive/refs/tags/${P}-RELEASE.tar.gz -> sourcekit-lsp-${PV}.tar.gz https://github.com/swiftlang/swift-cmark/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-cmark-${PV}.tar.gz https://github.com/swiftlang/swift-corelibs-foundation/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-foundation-${PV}.tar.gz + https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-libdispatch-${PV}.tar.gz https://github.com/swiftlang/swift-corelibs-xctest/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-corelibs-xctest-${PV}.tar.gz https://github.com/swiftlang/swift-docc-render-artifact/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-docc-render-artifact-${PV}.tar.gz https://github.com/swiftlang/swift-docc-symbolkit/archive/refs/tags/${P}-RELEASE.tar.gz -> swift-docc-symbolkit-${PV}.tar.gz
