public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swift: 5.0.2 -> 5.1.1

Browse Source
This commit is contained in:
Michael Roitzsch
2020-01-15 13:23:49 +01:00
parent 29098a81b3
commit b472f4a2de
8 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
+1 -1
View File
@@ -2,7 +2,7 @@ Don't build Ninja, we use our own.
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -721,7 +721,7 @@ swiftpm
@@ -745,7 +745,7 @@ swiftpm
dash-dash
pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
+3 -3
View File
@@ -2,12 +2,12 @@ allow custom install prefix
--- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200
@@ -728,7 +728,7 @@
@@ -752,7 +752,7 @@
install-swiftpm
install-xctest
install-libicu
-install-prefix=/usr
+install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
install-libcxx
install-sourcekit-lsp
build-swift-static-stdlib
pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
+3 -5
View File
@@ -2,7 +2,7 @@ Disable targets, where we use Nix packages.
--- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200
@@ -716,8 +716,6 @@
@@ -740,8 +740,6 @@
llbuild
swiftpm
xctest
@@ -11,15 +11,13 @@ Disable targets, where we use Nix packages.
dash-dash
@@ -727,11 +725,9 @@
@@ -751,9 +749,7 @@
install-llbuild
install-swiftpm
install-xctest
-install-libicu
install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
-install-libcxx
install-sourcekit-lsp
build-swift-static-stdlib
build-swift-static-sdk-overlay
build-swift-stdlib-unittest-extra
pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
+1 -1
View File
@@ -2,7 +2,7 @@ plumb extra-cmake-options
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s
@@ -766,6 +766,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s
pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
+1 -1
View File
@@ -2,7 +2,7 @@ The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
--- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200
+++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200
@@ -68,7 +68,7 @@
@@ -77,7 +77,7 @@
endif()
set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
-13
View File
@@ -1,13 +0,0 @@
Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning.
--- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200
+++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200
@@ -1053,7 +1053,7 @@
#else
#define _dispatch_client_assert_fail(fmt, ...) do { \
char *_msg = NULL; \
- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
+ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
##__VA_ARGS__); \
_dispatch_assert_crash(_msg); \
free(_msg); \