summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hansen2019-09-22 12:30:49 -0700
committerMichael Hansen2019-09-22 12:30:49 -0700
commitebb2c7c5023766c176cd68b6ca854e0d6639be14 (patch)
treea0e113353c2d91d3216519f97137f45be35bd89b
parente68c842f1d1a74b0cc6a1af6bf638d308453e915 (diff)
downloadaur-ebb2c7c5023766c176cd68b6ca854e0d6639be14.tar.gz
Update to 5.1
-rw-r--r--.SRCINFO60
-rw-r--r--PKGBUILD37
-rw-r--r--repl_swift-dl.patch12
3 files changed, 64 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 832f7b073ad..5f69d99b731 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = swift-language
pkgdesc = The Swift programming language and debugger
- pkgver = 5.0.3
+ pkgver = 5.1
pkgrel = 1
url = http://swift.org/
arch = i686
@@ -25,36 +25,38 @@ pkgbase = swift-language
depends = sqlite
depends = ncurses
depends = libblocksruntime
- source = swift-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-llvm-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-clang-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-clang-tools-extra-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-clang-tools-extra/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-libcxx-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-libcxx/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-lldb-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-cmark-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-llbuild-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-package-manager-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-corelibs-xctest-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-corelibs-foundation-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-corelibs-libdispatch-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-compiler-rt-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-5.0.3-RELEASE.tar.gz
- source = swift-integration-tests-5.0.3-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-5.0.3-RELEASE.tar.gz
+ source = swift-5.1-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-llvm-5.1-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-clang-5.1-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-clang-tools-extra-5.1-RELEASE.tar.gz::https://github.com/apple/swift-clang-tools-extra/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-libcxx-5.1-RELEASE.tar.gz::https://github.com/apple/swift-libcxx/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-lldb-5.1-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-cmark-5.1-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-llbuild-5.1-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-package-manager-5.1-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-corelibs-xctest-5.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-corelibs-foundation-5.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-corelibs-libdispatch-5.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-compiler-rt-5.1-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-5.1-RELEASE.tar.gz
+ source = swift-integration-tests-5.1-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-5.1-RELEASE.tar.gz
source = glibc-includes.patch
- sha256sums = b94bf54b6b6d228a7af2f8eae1202336272cd6502f16f056a82ef36f60539194
- sha256sums = 6ae9492980e358628ae8d081fdaa7828d28353eae238456e13963d2a578f47fb
- sha256sums = fa81a3ff208bf447f62a5f90135a3d943d9ccf09e3b04ed88ac48b706121fb25
- sha256sums = 7ff1a064cbf6e905f070a06aaebf7a4ec8787ce2a0b73c5858b584325c58b957
- sha256sums = e34d9ccb2a336e51151c82e3725e9e559519833179279f3b53afa16d27fac65b
- sha256sums = ff540419d333ff09d96807a701dd5a500b220a9bb167c7842d7ec814893b3261
- sha256sums = 2e2e450ce6e0d58644b5021f3354ef38e0fc3ef01a7068c1ea034467b5035dd4
- sha256sums = 207ec9e61ebe725b7015c47d9c92d8360bb7867cb11f6e836d1563dd317447e4
- sha256sums = 98da54196141a94e961b38455464bf646aba9e48b24e88f7afacf4a12d454523
- sha256sums = 121993ab9c29b8997cf606e62fe9579309b49cd22e21b017bba2e67a16e7b513
- sha256sums = 25ed4ca444c869b059f3cd7a623653e3050252354ab6490996b2100c250b9576
- sha256sums = 9a5779b181f1a1146134f233f45d7f9d9643f749dc4c61e76300951b6596b778
- sha256sums = 89ca34493703c168f86a3eff9d88e8042113819a82941bd5ae5ac1a083c28ba7
- sha256sums = f0a2931337d1966630340d5093c4d75ac5330ee5ac45f31bdbe77fe555b4ea4f
+ source = repl_swift-dl.patch
+ sha256sums = 04cbf97859cc691840a2c18354329e12f051226758b99f4a025d0bcca99ed4df
+ sha256sums = 3ed973401d62a9610c8d9be8afbb28d04f50340a773be48af6965033e80e0411
+ sha256sums = 3d704763df8e17af5559839484c29681c19e16e9801734c33cd4e12ffaba6cdf
+ sha256sums = f1f383106fd3589bc9566225015cfa88e671231f9e8695773f0012a93f9853c6
+ sha256sums = cf5a1dfe5d6fbfaaa26bc4b98c2033c48c513d06b9a1d5ae7180871d144caa0c
+ sha256sums = ca01ed89c886565155cd55129fa1d27d7486df031a409b2709f90937d4f81349
+ sha256sums = f0c6fdb8a81a9d422fbc47dc9e6408556b25198f50a0fddcb3aeccdaff56bcfd
+ sha256sums = cbd228619d1172f7f6d38983f0419226baa1cfbecc6afac891856fcb46ba4920
+ sha256sums = 830d79d777841c28c6b270083c3fd305bc1ba736086ad9790dee1673a23a6aee
+ sha256sums = adaaec994d18067a49596b0720b0c163da3a1915f20a619221834292b0e2af68
+ sha256sums = 9176e1334e2b8b6715c4d071be1337554438096b9f29d62f90aecfb5230148fa
+ sha256sums = da24d299eecc10e7d4b40a24e0700ca2f73da622795ecf6f4a5da4d33c486662
+ sha256sums = f2eb728ce1d4be21bb0e8bf7e099b6654a45ce8ff8dee6050e868822d7bbcd95
+ sha256sums = faad37015993a8713d10fd281e17d8bf308196c8cc4ecc45dc962e22141718cf
sha256sums = 6a94de9adbdc4182b297e0011a68c9387fd25864dcb4386654218c8c530032c2
+ sha256sums = 0b2dcb80d9f5cd987a6750b88dc71823980c47dcc711a993e71a496fd73d4e5e
pkgname = swift
pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index 9d2ef351a87..a2d22a93521 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=swift-language
pkgname=(swift swift-lldb)
-_swiftver=5.0.3-RELEASE
+_swiftver=5.1-RELEASE
pkgver=${_swiftver//-RELEASE/}
pkgrel=1
pkgdesc="The Swift programming language and debugger"
@@ -30,22 +30,24 @@ source=(
"swift-compiler-rt-${_swiftver}.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-${_swiftver}.tar.gz"
"swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
"glibc-includes.patch"
+ "repl_swift-dl.patch"
)
-sha256sums=('b94bf54b6b6d228a7af2f8eae1202336272cd6502f16f056a82ef36f60539194'
- '6ae9492980e358628ae8d081fdaa7828d28353eae238456e13963d2a578f47fb'
- 'fa81a3ff208bf447f62a5f90135a3d943d9ccf09e3b04ed88ac48b706121fb25'
- '7ff1a064cbf6e905f070a06aaebf7a4ec8787ce2a0b73c5858b584325c58b957'
- 'e34d9ccb2a336e51151c82e3725e9e559519833179279f3b53afa16d27fac65b'
- 'ff540419d333ff09d96807a701dd5a500b220a9bb167c7842d7ec814893b3261'
- '2e2e450ce6e0d58644b5021f3354ef38e0fc3ef01a7068c1ea034467b5035dd4'
- '207ec9e61ebe725b7015c47d9c92d8360bb7867cb11f6e836d1563dd317447e4'
- '98da54196141a94e961b38455464bf646aba9e48b24e88f7afacf4a12d454523'
- '121993ab9c29b8997cf606e62fe9579309b49cd22e21b017bba2e67a16e7b513'
- '25ed4ca444c869b059f3cd7a623653e3050252354ab6490996b2100c250b9576'
- '9a5779b181f1a1146134f233f45d7f9d9643f749dc4c61e76300951b6596b778'
- '89ca34493703c168f86a3eff9d88e8042113819a82941bd5ae5ac1a083c28ba7'
- 'f0a2931337d1966630340d5093c4d75ac5330ee5ac45f31bdbe77fe555b4ea4f'
- '6a94de9adbdc4182b297e0011a68c9387fd25864dcb4386654218c8c530032c2')
+sha256sums=('04cbf97859cc691840a2c18354329e12f051226758b99f4a025d0bcca99ed4df'
+ '3ed973401d62a9610c8d9be8afbb28d04f50340a773be48af6965033e80e0411'
+ '3d704763df8e17af5559839484c29681c19e16e9801734c33cd4e12ffaba6cdf'
+ 'f1f383106fd3589bc9566225015cfa88e671231f9e8695773f0012a93f9853c6'
+ 'cf5a1dfe5d6fbfaaa26bc4b98c2033c48c513d06b9a1d5ae7180871d144caa0c'
+ 'ca01ed89c886565155cd55129fa1d27d7486df031a409b2709f90937d4f81349'
+ 'f0c6fdb8a81a9d422fbc47dc9e6408556b25198f50a0fddcb3aeccdaff56bcfd'
+ 'cbd228619d1172f7f6d38983f0419226baa1cfbecc6afac891856fcb46ba4920'
+ '830d79d777841c28c6b270083c3fd305bc1ba736086ad9790dee1673a23a6aee'
+ 'adaaec994d18067a49596b0720b0c163da3a1915f20a619221834292b0e2af68'
+ '9176e1334e2b8b6715c4d071be1337554438096b9f29d62f90aecfb5230148fa'
+ 'da24d299eecc10e7d4b40a24e0700ca2f73da622795ecf6f4a5da4d33c486662'
+ 'f2eb728ce1d4be21bb0e8bf7e099b6654a45ce8ff8dee6050e868822d7bbcd95'
+ 'faad37015993a8713d10fd281e17d8bf308196c8cc4ecc45dc962e22141718cf'
+ '6a94de9adbdc4182b297e0011a68c9387fd25864dcb4386654218c8c530032c2'
+ '0b2dcb80d9f5cd987a6750b88dc71823980c47dcc711a993e71a496fd73d4e5e')
prepare() {
# Use python2 where appropriate
@@ -79,6 +81,9 @@ prepare() {
# Fix wrong glibc include paths in glibc module map
( cd swift && patch -p1 -i "$srcdir/glibc-includes.patch" )
+
+ # repl_swift requires -ldl
+ ( cd lldb && patch -p1 -i "$srcdir/repl_swift-dl.patch" )
}
_common_build_params=(
diff --git a/repl_swift-dl.patch b/repl_swift-dl.patch
new file mode 100644
index 00000000000..cf0b0e8477b
--- /dev/null
+++ b/repl_swift-dl.patch
@@ -0,0 +1,12 @@
+diff -rupN a/tools/repl/swift/CMakeLists.txt b/tools/repl/swift/CMakeLists.txt
+--- a/tools/repl/swift/CMakeLists.txt 2019-09-22 09:58:11.416432071 -0700
++++ b/tools/repl/swift/CMakeLists.txt 2019-09-22 09:58:36.799766163 -0700
+@@ -19,6 +19,8 @@ add_lldb_tool(repl_swift
+ main.c
+ )
+
++target_link_libraries(repl_swift PRIVATE dl)
++
+ # The dummy repl executable is a C program, but we always look for a mangled
+ # swift symbol (corresponding to main). If we build the repl with debug info,
+ # the debugger looks at the frame language (looking up the compile unit) and gets