commit: becab7e2389c25ee3535f554a8882399661531da Author: Itai Ferber <itai <AT> itaiferber <DOT> net> AuthorDate: Sun Apr 27 17:20:30 2025 +0000 Commit: Itai Ferber <itai <AT> itaiferber <DOT> net> CommitDate: Sun Apr 27 17:25:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=becab7e2
dev-lang/swift: fix broken 5.10.1 patch symlink 2849e1a7d removed swift-6.0.1, -6.0.1-r1, and -6.0.2, but swift-5.10.1-r2/backtracing-noexecstack.patch was symlinked to swift-6.0.1's version. The effective file has been moved down to swift-5.10.1-r2 and the swift-6.x line now symlinks to this base file; the contents have not changed. Closes: https://bugs.gentoo.org/954338 Signed-off-by: Itai Ferber <itai <AT> itaiferber.net> .../files/swift-5.10.1-r2/backtracing-noexecstack.patch | 16 +++++++++++++++- .../files/swift-6.0.3/backtracing-noexecstack.patch | 16 +--------------- 2 files changed, 16 insertions(+), 16 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 deleted file mode 120000 index 58b20ae89..000000000 --- a/dev-lang/swift/files/swift-5.10.1-r2/backtracing-noexecstack.patch +++ /dev/null @@ -1 +0,0 @@ -../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/backtracing-noexecstack.patch b/dev-lang/swift/files/swift-5.10.1-r2/backtracing-noexecstack.patch new file mode 100644 index 000000000..83cf5de04 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r2/backtracing-noexecstack.patch @@ -0,0 +1,15 @@ +# The Swift backtracer needs to get CPU context information when producing +# backtraces, which is necessarily written in assembly. Because it tries to be +# portable, it doesn't include a note indicating that the assembled binary +# doesn't require an executable stack; we need to include one explicitly to turn +# it off. + +--- a/swift/stdlib/public/Backtracing/get-cpu-context.S ++++ b/swift/stdlib/public/Backtracing/get-cpu-context.S +@@ -140,3 +140,6 @@ FN(_swift_get_cpu_context): + bx lr + #endif + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch b/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch deleted file mode 100644 index 83cf5de04..000000000 --- a/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch +++ /dev/null @@ -1,15 +0,0 @@ -# The Swift backtracer needs to get CPU context information when producing -# backtraces, which is necessarily written in assembly. Because it tries to be -# portable, it doesn't include a note indicating that the assembled binary -# doesn't require an executable stack; we need to include one explicitly to turn -# it off. - ---- a/swift/stdlib/public/Backtracing/get-cpu-context.S -+++ b/swift/stdlib/public/Backtracing/get-cpu-context.S -@@ -140,3 +140,6 @@ FN(_swift_get_cpu_context): - bx lr - #endif - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch b/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch new file mode 120000 index 000000000..d515a629a --- /dev/null +++ b/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch @@ -0,0 +1 @@ +../swift-5.10.1-r2/backtracing-noexecstack.patch \ No newline at end of file
