From 731832ced0673e45c73931f33322a6b0d9660bec Mon Sep 17 00:00:00 2001 From: Katalin Rebhan Date: Wed, 1 Jul 2026 02:28:24 +0200 Subject: [PATCH] dev-lang/swift: remove #include This header was removed recently (looks like with Linux 7.1). Remove the usage for it in libsanitizer so that it builds again. See https://github.com/llvm/llvm-project/issues/194110. Signed-off-by: Katalin Rebhan --- .../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 insertions(+) create mode 100644 dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch create mode 120000 dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch create mode 120000 dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch create mode 120000 dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch create 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 new file mode 100644 index 0000000000..e505db9f72 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch @@ -0,0 +1,23 @@ +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 new file mode 120000 index 0000000000..816f9dc267 --- /dev/null +++ b/dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch @@ -0,0 +1 @@ +../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 new file mode 120000 index 0000000000..9cc2630e60 --- /dev/null +++ b/dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch @@ -0,0 +1 @@ +../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 new file mode 120000 index 0000000000..f1e3febcde --- /dev/null +++ b/dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch @@ -0,0 +1 @@ +../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 new file mode 120000 index 0000000000..6dddb10c4e --- /dev/null +++ b/dev-lang/swift/files/swift-6.3-r1/sanitizer-remove-scc.patch @@ -0,0 +1 @@ +../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 4e18de8094..4c4f093f25 100644 --- a/dev-lang/swift/swift-5.10.1-r5.ebuild +++ b/dev-lang/swift/swift-5.10.1-r5.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/lldb-cmake-minimum-version.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 42bd5a7d8e..216add7c0a 100644 --- a/dev-lang/swift/swift-6.0.3-r2.ebuild +++ b/dev-lang/swift/swift-6.0.3-r2.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.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 9bbd4b068d..4b8e89c906 100644 --- a/dev-lang/swift/swift-6.1.3.ebuild +++ b/dev-lang/swift/swift-6.1.3.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.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 6c475afbc0..7b068ed49b 100644 --- a/dev-lang/swift/swift-6.2.4.ebuild +++ b/dev-lang/swift/swift-6.2.4.ebuild @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.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 b45a8ce477..e10d5f44a3 100644 --- a/dev-lang/swift/swift-6.3-r1.ebuild +++ b/dev-lang/swift/swift-6.3-r1.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.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 b45a8ce477..e10d5f44a3 100644 --- a/dev-lang/swift/swift-6.3.1.ebuild +++ b/dev-lang/swift/swift-6.3.1.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.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 b45a8ce477..e10d5f44a3 100644 --- a/dev-lang/swift/swift-6.3.2.ebuild +++ b/dev-lang/swift/swift-6.3.2.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" "${FILESDIR}/${PF}/link-with-lld.patch" "${FILESDIR}/${PF}/respect-c-cxx-flags.patch" + "${FILESDIR}/${PF}/sanitizer-remove-scc.patch" ) S="${WORKDIR}"