diff options
Diffstat (limited to 'pkgs/development/compilers/swift/patches')
3 files changed, 18 insertions, 19 deletions
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch index 0e18e8812a8..66723f1cdf3 100644 --- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch @@ -11,13 +11,13 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini index e6b0af3581..1095cbaab7 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -692,7 +692,7 @@ install-lldb +@@ -708,7 +708,7 @@ install-lldb install-llbuild install-swiftpm install-xctest -install-prefix=/usr +install-prefix=%(install_prefix)s - swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license + swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc build-swift-static-stdlib build-swift-static-sdk-overlay -- diff --git a/pkgs/development/compilers/swift/patches/icu59.patch b/pkgs/development/compilers/swift/patches/icu59.patch index 83d7e62636a..26337814caf 100644 --- a/pkgs/development/compilers/swift/patches/icu59.patch +++ b/pkgs/development/compilers/swift/patches/icu59.patch @@ -99,3 +99,15 @@ if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) { swift::crash("u_strToLower: Unexpected error lowercasing unicode string."); } +@@ -300,9 +300,9 @@ + + swift::__swift_stdlib_UBreakIterator *swift::__swift_stdlib_ubrk_open( + swift::__swift_stdlib_UBreakIteratorType type, const char *locale, +- const UChar *text, int32_t textLength, __swift_stdlib_UErrorCode *status) { ++ const __swift_stdlib_UChar * text, __swift_int32_t textLength, __swift_stdlib_UErrorCode *status) { + return ptr_cast<swift::__swift_stdlib_UBreakIterator>( +- ubrk_open(static_cast<UBreakIteratorType>(type), locale, text, textLength, ++ ubrk_open(static_cast<UBreakIteratorType>(type), locale, reinterpret_cast<const UChar *>(text), textLength, + ptr_cast<UErrorCode>(status))); + } + diff --git a/pkgs/development/compilers/swift/patches/sigunused.patch b/pkgs/development/compilers/swift/patches/sigunused.patch index 42e6e297e0a..2701d1a3ae2 100644 --- a/pkgs/development/compilers/swift/patches/sigunused.patch +++ b/pkgs/development/compilers/swift/patches/sigunused.patch @@ -1,22 +1,9 @@ ---- a/swift-corelibs-libdispatch/libpwq/src/posix/manager.c -+++ b/swift-corelibs-libdispatch/libpwq/src/posix/manager.c -@@ -273,9 +273,6 @@ static void sigmask_init(void) - sigdelset(&sigmask, SIGFPE); - sigdelset(&sigmask, SIGBUS); - sigdelset(&sigmask, SIGSEGV); --#if SIGSYS != SIGUNUSED -- sigdelset(&sigmask, SIGSYS); --#endif - sigdelset(&sigmask, SIGPIPE); - sigdelset(&sigmask, SIGPROF); - - ---- a/swiftpm/Sources/Utility/Process.swift -+++ b/swiftpm/Sources/Utility/Process.swift -@@ -140,7 +140,7 @@ public final class Process: ObjectIdentifierProtocol { +--- a/swiftpm/Sources/Basic/Process.swift ++++ b/swiftpm/Sources/Basic/Process.swift +@@ -258,7 +258,7 @@ public func launch() throws { // modify, so we have to take care about the set we use. var mostSignals = sigset_t() - sigemptyset(&mostSignals); + sigemptyset(&mostSignals) - for i in 1 ..< SIGUNUSED { + for i in 1 ..< SIGSYS { if i == SIGKILL || i == SIGSTOP { |