From 65eea909ca7f4a64d60fe1998525e6a8cf0be2fc Mon Sep 17 00:00:00 2001 From: Itai Ferber Date: Thu, 2 Jul 2026 19:58:29 -0400 Subject: [PATCH] dev-lang/swift: resolve conflicting patches While working on updates to resolve GCC 16 build issues, I backported an upstream patch for removing a reference to `` (80fbc4c2a); simultaneously, a similar patch was added (731832ced) that introduced the same fix. The conflict wasn't caught during the rebase. Signed-off-by: Itai Ferber --- .../sanitizer-remove-scc.patch | 23 ------------------- .../swift-6.0.3-r2/sanitizer-remove-scc.patch | 1 - .../swift-6.1.3/sanitizer-remove-scc.patch | 1 - .../swift-6.2.4/sanitizer-remove-scc.patch | 1 - .../swift-6.3-r1/sanitizer-remove-scc.patch | 1 - dev-lang/swift/swift-5.10.1-r5.ebuild | 1 - dev-lang/swift/swift-6.0.3-r2.ebuild | 1 - dev-lang/swift/swift-6.1.3.ebuild | 1 - dev-lang/swift/swift-6.2.4.ebuild | 1 - dev-lang/swift/swift-6.3-r1.ebuild | 1 - dev-lang/swift/swift-6.3.1.ebuild | 1 - dev-lang/swift/swift-6.3.2.ebuild | 1 - 12 files changed, 34 deletions(-) delete mode 100644 dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch delete mode 120000 dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch delete mode 120000 dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch delete mode 120000 dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch delete mode 120000 dev-lang/swift/files/swift-6.3-r1/sanitizer-remove-scc.patch diff --git a/dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch b/dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch deleted file mode 100644 index e505db9f72..0000000000 --- a/dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch +++ /dev/null @@ -1,23 +0,0 @@ -Based off of Swift 6.3.2 sources. - -diff --git a/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -index ea8cc30..88eccec 100644 ---- a/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -157,7 +157,6 @@ typedef struct user_fpregs elf_fpregset_t; - #include - #include - #include --#include - #include - #include - #include -@@ -532,8 +531,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned struct_kbsentry_sz = sizeof(struct kbsentry); - unsigned struct_mtconfiginfo_sz = sizeof(struct mtconfiginfo); - unsigned struct_nr_parms_struct_sz = sizeof(struct nr_parms_struct); -- unsigned struct_scc_modem_sz = sizeof(struct scc_modem); -- unsigned struct_scc_stat_sz = sizeof(struct scc_stat); - unsigned struct_serial_multiport_struct_sz - = sizeof(struct serial_multiport_struct); - unsigned struct_serial_struct_sz = sizeof(struct serial_struct); diff --git a/dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch b/dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch deleted file mode 120000 index 816f9dc267..0000000000 --- a/dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch +++ /dev/null @@ -1 +0,0 @@ -../swift-5.10.1-r5/sanitizer-remove-scc.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch b/dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch deleted file mode 120000 index 9cc2630e60..0000000000 --- a/dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch +++ /dev/null @@ -1 +0,0 @@ -../swift-6.0.3-r2/sanitizer-remove-scc.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch b/dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch deleted file mode 120000 index f1e3febcde..0000000000 --- a/dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch +++ /dev/null @@ -1 +0,0 @@ -../swift-6.1.3/sanitizer-remove-scc.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-6.3-r1/sanitizer-remove-scc.patch b/dev-lang/swift/files/swift-6.3-r1/sanitizer-remove-scc.patch deleted file mode 120000 index 6dddb10c4e..0000000000 --- a/dev-lang/swift/files/swift-6.3-r1/sanitizer-remove-scc.patch +++ /dev/null @@ -1 +0,0 @@ -../swift-6.2.4/sanitizer-remove-scc.patch \ No newline at end of file diff --git a/dev-lang/swift/swift-5.10.1-r5.ebuild b/dev-lang/swift/swift-5.10.1-r5.ebuild index dd9c495098..8cf9ddc665 100644 --- a/dev-lang/swift/swift-5.10.1-r5.ebuild +++ b/dev-lang/swift/swift-5.10.1-r5.ebuild @@ -60,7 +60,6 @@ PATCHES=( "${FILESDIR}/${PF}/lldb-cmake-minimum-version.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.0.3-r2.ebuild b/dev-lang/swift/swift-6.0.3-r2.ebuild index 031d9acfb9..94150189c0 100644 --- a/dev-lang/swift/swift-6.0.3-r2.ebuild +++ b/dev-lang/swift/swift-6.0.3-r2.ebuild @@ -60,7 +60,6 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.1.3.ebuild b/dev-lang/swift/swift-6.1.3.ebuild index 9aa8ea7e25..2330594f21 100644 --- a/dev-lang/swift/swift-6.1.3.ebuild +++ b/dev-lang/swift/swift-6.1.3.ebuild @@ -62,7 +62,6 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.2.4.ebuild b/dev-lang/swift/swift-6.2.4.ebuild index bdbd566a46..4f8ed673d2 100644 --- a/dev-lang/swift/swift-6.2.4.ebuild +++ b/dev-lang/swift/swift-6.2.4.ebuild @@ -63,7 +63,6 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.3-r1.ebuild b/dev-lang/swift/swift-6.3-r1.ebuild index 409630f4dd..49a2daf623 100644 --- a/dev-lang/swift/swift-6.3-r1.ebuild +++ b/dev-lang/swift/swift-6.3-r1.ebuild @@ -65,7 +65,6 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.3.1.ebuild b/dev-lang/swift/swift-6.3.1.ebuild index 409630f4dd..49a2daf623 100644 --- a/dev-lang/swift/swift-6.3.1.ebuild +++ b/dev-lang/swift/swift-6.3.1.ebuild @@ -65,7 +65,6 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.3.2.ebuild b/dev-lang/swift/swift-6.3.2.ebuild index 409630f4dd..49a2daf623 100644 --- a/dev-lang/swift/swift-6.3.2.ebuild +++ b/dev-lang/swift/swift-6.3.2.ebuild @@ -65,7 +65,6 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/remove-linux-scc_h.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" - "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}"