mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-07 06:02:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-lang/swift: resolve conflicting patches

Browse Source 
While working on updates to resolve GCC 16 build issues, I backported an
upstream patch for removing a reference to `<linux/scc.h>` (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 <itai@itaiferber.net>
This commit is contained in:
Itai Ferber
2026-07-02 19:58:29 -04:00
parent e1702689a3
commit 65eea909ca
12 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dev-lang/swift/files/swift-5.10.1-r5/sanitizer-remove-scc.patch
View File

@@ -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 <linux/lp.h>
#include <linux/mroute.h>
#include <linux/mroute6.h>
-#include <linux/scc.h>
#include <linux/serial.h>
#include <sys/msg.h>
#include <sys/ipc.h>
@@ -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);

1
dev-lang/swift/files/swift-6.0.3-r2/sanitizer-remove-scc.patch
View File

@@ -1 +0,0 @@
../swift-5.10.1-r5/sanitizer-remove-scc.patch

1
dev-lang/swift/files/swift-6.1.3/sanitizer-remove-scc.patch
View File

@@ -1 +0,0 @@
../swift-6.0.3-r2/sanitizer-remove-scc.patch

1
dev-lang/swift/files/swift-6.2.4/sanitizer-remove-scc.patch
View File

@@ -1 +0,0 @@
../swift-6.1.3/sanitizer-remove-scc.patch

1
dev-lang/swift/files/swift-6.3-r1/sanitizer-remove-scc.patch
View File

@@ -1 +0,0 @@
../swift-6.2.4/sanitizer-remove-scc.patch

1
dev-lang/swift/swift-5.10.1-r5.ebuild
View File

@@ -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}"

1
dev-lang/swift/swift-6.0.3-r2.ebuild
View File

@@ -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}"

1
dev-lang/swift/swift-6.1.3.ebuild
View File

@@ -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}"

1
dev-lang/swift/swift-6.2.4.ebuild
View File

@@ -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}"

1
dev-lang/swift/swift-6.3-r1.ebuild
View File

@@ -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}"

1
dev-lang/swift/swift-6.3.1.ebuild
View File

@@ -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}"

1
dev-lang/swift/swift-6.3.2.ebuild
View File

@@ -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}"