From e2783b299c906756b3954948b08aa8a08b90878f Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 4 Feb 2018 14:38:20 +0900 Subject: [PATCH 1/2] swift: fix build --- pkgs/development/compilers/swift/default.nix | 36 ++++++- .../compilers/swift/patches/icu59.patch | 101 ++++++++++++++++++ .../swift/patches/remove_xlocale.patch | 54 ++++++++++ .../compilers/swift/patches/sigaltstack.patch | 11 ++ .../compilers/swift/patches/sigunused.patch | 24 +++++ 5 files changed, 223 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/swift/patches/icu59.patch create mode 100644 pkgs/development/compilers/swift/patches/remove_xlocale.patch create mode 100644 pkgs/development/compilers/swift/patches/sigaltstack.patch create mode 100644 pkgs/development/compilers/swift/patches/sigunused.patch diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 937977b0a97..62edb9044e5 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -12,7 +12,6 @@ , swig , bash , libxml2 -, llvm , clang , python , ncurses @@ -28,8 +27,10 @@ , git , libgit2 , fetchFromGitHub +, fetchpatch , paxctl , findutils +, makeWrapper #, systemtap }: @@ -47,7 +48,7 @@ let name = "${repo}-${version}-src"; }; -sources = { + sources = { # FYI: SourceKit probably would work but currently requires building everything twice # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 clang = fetch { @@ -119,6 +120,8 @@ sources = { ]; builder = '' + NIX_CFLAGS_COMPILE=$( echo ${clang.default_cxx_stdlib_compile} ) + $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ installable_package=$INSTALLABLE_PACKAGE \ @@ -126,6 +129,20 @@ sources = { install_destdir=$SWIFT_INSTALL_DIR \ extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; + # from llvm/4/llvm.nix + sigaltstackPatch = fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + }; + + # https://bugs.swift.org/browse/SR-6409 + sigunusedPatch = fetchpatch { + name = "sigunused.patch"; + url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff"; + sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m"; + }; + in stdenv.mkDerivation rec { name = "swift-${version_friendly}"; @@ -145,6 +162,7 @@ stdenv.mkDerivation rec { rsync which findutils + makeWrapper ] ++ stdenv.lib.optional stdenv.needsPax paxctl; # TODO: Revisit what's propagated and how @@ -209,6 +227,10 @@ stdenv.mkDerivation rec { patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} + # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 + patch -p1 -i ${./patches/remove_xlocale.patch} + # https://bugs.swift.org/browse/SR-4633 + patch -p1 -d swift -i ${./patches/icu59.patch} substituteInPlace clang/lib/Driver/ToolChains.cpp \ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ @@ -232,6 +254,11 @@ stdenv.mkDerivation rec { --replace usr "$PREFIX" substituteInPlace swiftpm/Utilities/bootstrap \ --replace "usr" "$PREFIX" + '' + stdenv.lib.optionalString (stdenv ? glibc) '' + patch -p1 -d compiler-rt -i ${sigaltstackPatch} + patch -p1 -d compiler-rt -i ${./patches/sigaltstack.patch} + patch -p1 -d llbuild -i ${sigunusedPatch} + patch -p1 -i ${./patches/sigunused.patch} ''; doCheck = false; @@ -251,6 +278,10 @@ stdenv.mkDerivation rec { # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar + + wrapProgram $out/bin/swift \ + --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ + --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include ''; # Hack to avoid TMPDIR in RPATHs. @@ -263,7 +294,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. platforms = [ "x86_64-linux" ]; - broken = true; }; } diff --git a/pkgs/development/compilers/swift/patches/icu59.patch b/pkgs/development/compilers/swift/patches/icu59.patch new file mode 100644 index 00000000000..83d7e62636a --- /dev/null +++ b/pkgs/development/compilers/swift/patches/icu59.patch @@ -0,0 +1,101 @@ +--- a/stdlib/public/stubs/UnicodeNormalization.cpp ++++ b/stdlib/public/stubs/UnicodeNormalization.cpp +@@ -86,11 +86,8 @@ ASCIICollation() { + for (unsigned char c = 0; c < 128; ++c) { + UErrorCode ErrorCode = U_ZERO_ERROR; + intptr_t NumCollationElts = 0; +-#if defined(__CYGWIN__) || defined(_MSC_VER) + UChar Buffer[1]; +-#else +- uint16_t Buffer[1]; +-#endif ++ + Buffer[0] = c; + + UCollationElements *CollationIterator = +@@ -127,18 +124,9 @@ swift::_swift_stdlib_unicode_compare_utf16_utf16(const uint16_t *LeftString, + int32_t LeftLength, + const uint16_t *RightString, + int32_t RightLength) { +-#if defined(__CYGWIN__) || defined(_MSC_VER) +- // ICU UChar type is platform dependent. In Cygwin, it is defined +- // as wchar_t which size is 2. It seems that the underlying binary +- // representation is same with swift utf16 representation. + return ucol_strcoll(GetRootCollator(), + reinterpret_cast(LeftString), LeftLength, + reinterpret_cast(RightString), RightLength); +-#else +- return ucol_strcoll(GetRootCollator(), +- LeftString, LeftLength, +- RightString, RightLength); +-#endif + } + + /// Compares the strings via the Unicode Collation Algorithm on the root locale. +@@ -156,12 +144,8 @@ swift::_swift_stdlib_unicode_compare_utf8_utf16(const unsigned char *LeftString, + UErrorCode ErrorCode = U_ZERO_ERROR; + + uiter_setUTF8(&LeftIterator, reinterpret_cast(LeftString), LeftLength); +-#if defined(__CYGWIN__) || defined(_MSC_VER) + uiter_setString(&RightIterator, reinterpret_cast(RightString), + RightLength); +-#else +- uiter_setString(&RightIterator, RightString, RightLength); +-#endif + + uint32_t Diff = ucol_strcollIter(GetRootCollator(), + &LeftIterator, &RightIterator, &ErrorCode); +@@ -199,14 +183,10 @@ swift::_swift_stdlib_unicode_compare_utf8_utf8(const unsigned char *LeftString, + void *swift::_swift_stdlib_unicodeCollationIterator_create( + const __swift_uint16_t *Str, __swift_uint32_t Length) { + UErrorCode ErrorCode = U_ZERO_ERROR; +-#if defined(__CYGWIN__) || defined(_MSC_VER) + UCollationElements *CollationIterator = ucol_openElements( + GetRootCollator(), reinterpret_cast(Str), Length, + &ErrorCode); +-#else +- UCollationElements *CollationIterator = ucol_openElements( +- GetRootCollator(), Str, Length, &ErrorCode); +-#endif ++ + if (U_FAILURE(ErrorCode)) { + swift::crash("_swift_stdlib_unicodeCollationIterator_create: ucol_openElements() failed."); + } +@@ -244,17 +224,12 @@ swift::_swift_stdlib_unicode_strToUpper(uint16_t *Destination, + const uint16_t *Source, + int32_t SourceLength) { + UErrorCode ErrorCode = U_ZERO_ERROR; +-#if defined(__CYGWIN__) || defined(_MSC_VER) + uint32_t OutputLength = u_strToUpper(reinterpret_cast(Destination), + DestinationCapacity, + reinterpret_cast(Source), + SourceLength, + "", &ErrorCode); +-#else +- uint32_t OutputLength = u_strToUpper(Destination, DestinationCapacity, +- Source, SourceLength, +- "", &ErrorCode); +-#endif ++ + if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) { + swift::crash("u_strToUpper: Unexpected error uppercasing unicode string."); + } +@@ -271,17 +246,12 @@ swift::_swift_stdlib_unicode_strToLower(uint16_t *Destination, + const uint16_t *Source, + int32_t SourceLength) { + UErrorCode ErrorCode = U_ZERO_ERROR; +-#if defined(__CYGWIN__) || defined(_MSC_VER) + uint32_t OutputLength = u_strToLower(reinterpret_cast(Destination), + DestinationCapacity, + reinterpret_cast(Source), + SourceLength, + "", &ErrorCode); +-#else +- uint32_t OutputLength = u_strToLower(Destination, DestinationCapacity, +- Source, SourceLength, +- "", &ErrorCode); +-#endif ++ + if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) { + swift::crash("u_strToLower: Unexpected error lowercasing unicode string."); + } diff --git a/pkgs/development/compilers/swift/patches/remove_xlocale.patch b/pkgs/development/compilers/swift/patches/remove_xlocale.patch new file mode 100644 index 00000000000..8ef7e391696 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/remove_xlocale.patch @@ -0,0 +1,54 @@ +--- a/swift/stdlib/public/SDK/os/os_trace_blob.c ++++ b/swift/stdlib/public/SDK/os/os_trace_blob.c +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + #include "os_trace_blob.h" + + OS_NOINLINE + +--- a/swift/stdlib/public/stubs/Stubs.cpp ++++ b/swift/stdlib/public/stubs/Stubs.cpp +@@ -61,7 +61,6 @@ + #define strtof_l swift_strtof_l + #define strtold_l swift_strtold_l + #else +-#include + #endif + #include + #include "llvm/ADT/StringExtras.h" + +--- a/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringDefaultEncoding.h ++++ b/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringDefaultEncoding.h +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + + CF_EXTERN_C_BEGIN + + +--- a/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringEncodings.c ++++ b/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringEncodings.c +@@ -24,7 +24,6 @@ + #include + #include + #include +-#include + #include + #endif + + +--- a/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h ++++ b/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h +@@ -95,7 +95,6 @@ + #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD + #if TARGET_OS_CYGWIN + #else +-#include + #endif + #include + #include diff --git a/pkgs/development/compilers/swift/patches/sigaltstack.patch b/pkgs/development/compilers/swift/patches/sigaltstack.patch new file mode 100644 index 00000000000..c529fa3777b --- /dev/null +++ b/pkgs/development/compilers/swift/patches/sigaltstack.patch @@ -0,0 +1,11 @@ +--- a/lib/esan/esan_sideline_linux.cpp ++++ b/lib/esan/esan_sideline_linux.cpp +@@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) { + + // Set up a signal handler on an alternate stack for safety. + InternalScopedBuffer StackMap(SigAltStackSize); +- struct sigaltstack SigAltStack; ++ stack_t SigAltStack; + SigAltStack.ss_sp = StackMap.data(); + SigAltStack.ss_size = SigAltStackSize; + SigAltStack.ss_flags = 0; diff --git a/pkgs/development/compilers/swift/patches/sigunused.patch b/pkgs/development/compilers/swift/patches/sigunused.patch new file mode 100644 index 00000000000..42e6e297e0a --- /dev/null +++ b/pkgs/development/compilers/swift/patches/sigunused.patch @@ -0,0 +1,24 @@ +--- 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 { + // modify, so we have to take care about the set we use. + var mostSignals = sigset_t() + sigemptyset(&mostSignals); +- for i in 1 ..< SIGUNUSED { ++ for i in 1 ..< SIGSYS { + if i == SIGKILL || i == SIGSTOP { + continue + } From c275c3dc303938fa205df09cb3f9c1152bd5f03e Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 12 Feb 2018 15:31:47 +0900 Subject: [PATCH 2/2] swift: 3.1.1 -> 4.0.3 --- pkgs/development/compilers/swift/default.nix | 46 +++++++++++-------- ...ts-linux-allow-custom-install-prefix.patch | 4 +- .../compilers/swift/patches/icu59.patch | 12 +++++ .../compilers/swift/patches/sigunused.patch | 21 ++------- 4 files changed, 46 insertions(+), 37 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 62edb9044e5..360f96e1242 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -31,11 +31,13 @@ , paxctl , findutils , makeWrapper +, gnumake +, file #, systemtap }: let - v_major = "3.1.1"; + v_major = "4.0.3"; version = "${v_major}-RELEASE"; version_friendly = "${v_major}"; @@ -53,48 +55,48 @@ let # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 clang = fetch { repo = "swift-clang"; - sha256 = "1gmdgr8jph87nya8cgdl7iwrggbji2sag996m27hkbszw4nxy8sd"; + sha256 = "0zm624iwiprk3c3nzqf4p1fd9zqic4yi3jv51cw3249ax4x6vy10"; }; llvm = fetch { repo = "swift-llvm"; - sha256 = "0nwd7cp6mbj7f6a2rx8123n7ygs8406hsx7hp7ybagww6v75bwzi"; + sha256 = "11vw6461c0cdvwm1wna1a5709fjj14hzp6br6jg94p4f6jp3yv4d"; }; compilerrt = fetch { repo = "swift-compiler-rt"; - sha256 = "1gjcr6g3ffs3nhf4a84iwg4flbd7rqcf9rvvclwyq96msa3mj950"; + sha256 = "1hj4qaj4c9n2wzg2cvarbyl0n708zd1dlw4zkzq07fjxxqs36nfa"; }; cmark = fetch { repo = "swift-cmark"; - sha256 = "0qf2f3zd8lndkfbxbz6vkznzz8rvq5gigijh7pgmfx9fi4zcssqx"; + sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325"; }; lldb = fetch { repo = "swift-lldb"; - sha256 = "17n4whpf3wxw9zaayiq21gk9q3547qxi4rvxld2hybh0k7a1bj5c"; + sha256 = "0yk5qg85008vcn63vn2jpn5ls9pdhda222p2w1cfkrj27k5k8vqr"; }; llbuild = fetch { repo = "swift-llbuild"; - sha256 = "1l3hnb2s01jby91k1ipbc3bhszq14vyx5pzdhf2chld1yhpg420d"; + sha256 = "0jffw6z1s6ck1i05brw59x6vsg7zrxbz5n2wz72fj29rh3nppc7a"; }; pm = fetch { repo = "swift-package-manager"; - sha256 = "1ayy5vk3mjk354pg9bf68wvnaj3jymx23w0qnlw1jxz256ff8fwi"; + sha256 = "0xj070b8fii7ijfsnyq4fxgv6569vdrg0yippi85h2p1l7s9aagh"; }; xctest = fetch { repo = "swift-corelibs-xctest"; - sha256 = "0cj5y7wanllfldag08ci567x12aw793c79afckpbsiaxmwy4xhnm"; + sha256 = "0l355wq8zfwrpv044xf4smjwbm0bmib360748n8cwls3vkr9l2yv"; }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "1d1ldk7ckqn4mhmdhsx2zrmsd6jfxzgdywn2pki7limk979hcwjc"; + sha256 = "0s7yc5gsbd96a4bs8c6q24dyfjm4xhcr2nzhl2ics8dmi60j15s4"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "0ckjg41fjak06i532azhryckjq64fkxzsal4svf5v4s8n9mkq2sg"; + sha256 = "0x8zzq3shhvmhq4sbhaaa0ddiv3nw347pz6ayym6jyzq7j9n15ia"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "0879jlv37lmxc1apzi53xn033y72548i86r7fzwr0g52124q5gry"; + sha256 = "0a1gq0k5701i418f0qi7kywv16q7vh4a4wp0f6fpyv4sjkq27msx"; }; }; @@ -120,7 +122,8 @@ let ]; builder = '' - NIX_CFLAGS_COMPILE=$( echo ${clang.default_cxx_stdlib_compile} ) + # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found + NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ @@ -163,6 +166,7 @@ stdenv.mkDerivation rec { which findutils makeWrapper + gnumake ] ++ stdenv.lib.optional stdenv.needsPax paxctl; # TODO: Revisit what's propagated and how @@ -216,6 +220,14 @@ stdenv.mkDerivation rec { # Just patch all the things for now, we can focus this later patchShebangs $SWIFT_SOURCE_ROOT + # TODO eliminate use of env. + find -type f -print0 | xargs -0 sed -i \ + -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ + -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ + -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ + -e 's|/bin/cp|${coreutils}/bin/cp|g' \ + -e 's|/usr/bin/file|${file}/bin/file|g' + substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ --replace '/usr/include' "${stdenv.cc.libc.dev}/include" substituteInPlace swift/utils/build-script-impl \ @@ -232,6 +244,9 @@ stdenv.mkDerivation rec { # https://bugs.swift.org/browse/SR-4633 patch -p1 -d swift -i ${./patches/icu59.patch} + # https://bugs.swift.org/browse/SR-5779 + sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake + substituteInPlace clang/lib/Driver/ToolChains.cpp \ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' @@ -239,16 +254,11 @@ stdenv.mkDerivation rec { # Workaround hardcoded dep on "libcurses" (vs "libncurses"): sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt - substituteInPlace llbuild/tests/BuildSystem/Build/basic.llbuild \ - --replace /usr/bin/env $(type -p env) # This test fails on one of my machines, not sure why. # Disabling for now. rm llbuild/tests/Examples/buildsystem-capi.llbuild - substituteInPlace swift-corelibs-foundation/lib/script.py \ - --replace /bin/cp $(type -p cp) - PREFIX=''${out/#\/} substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" 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( +- ubrk_open(static_cast(type), locale, text, textLength, ++ ubrk_open(static_cast(type), locale, reinterpret_cast(text), textLength, + ptr_cast(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 {