Apply build-script patch from preview version

3 files changed, 21 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f85869b3fd61..5d48b1b0b88d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Oct 31 16:47:07 UTC 2016
+# Wed Nov 23 22:16:20 UTC 2016
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
 	pkgver = 3.0.1
@@ -38,6 +38,7 @@ pkgbase = swift-language
 	source = swift-integration-tests-3.0.1-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-3.0.1-RELEASE.tar.gz
 	source = swift-sphinx2.patch
 	source = xar-1.6.patch
+	source = build-script.patch
 	sha256sums = 5770cc45fe352d8a96d35ee35222cba0a47883b057e012a5464d411898afa074
 	sha256sums = 5cfaa08743b29e6c8a948654b71fef608a48953b3eb928c3049c07ca279275c9
 	sha256sums = 470e3c735a675aa37f58e4fe206a2d4141478a318dcb78c3fc8121e087e782b4
@@ -51,6 +52,7 @@ pkgbase = swift-language
 	sha256sums = fc686e6fba5ab9c2520bde71031116cfe57d3230098ad3cdea513a2e367c61af
 	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
 	sha256sums = df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6
+	sha256sums = 9f2512df8c495e2b8bf19fe213e951cdd17df9207538ceb8ab59a30bd6a18e3f
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index b89e5ccf1bed..96e3d60a9f2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ source=(
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-libdispatch-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
-    "swift-sphinx2.patch" "xar-1.6.patch"
+    "swift-sphinx2.patch" "xar-1.6.patch" "build-script.patch"
 )
 sha256sums=('5770cc45fe352d8a96d35ee35222cba0a47883b057e012a5464d411898afa074'
             '5cfaa08743b29e6c8a948654b71fef608a48953b3eb928c3049c07ca279275c9'
@@ -38,7 +38,8 @@ sha256sums=('5770cc45fe352d8a96d35ee35222cba0a47883b057e012a5464d411898afa074'
             'ccfd071018f69540fa5e2a6691d5cc5e401c3b2fa19651d38a3f915b4a0b5d36'
             'fc686e6fba5ab9c2520bde71031116cfe57d3230098ad3cdea513a2e367c61af'
             '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f'
-            'df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6')
+            'df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6'
+            '9f2512df8c495e2b8bf19fe213e951cdd17df9207538ceb8ab59a30bd6a18e3f')
 
 prepare() {
     # Use python2 where appropriate
@@ -71,6 +72,9 @@ prepare() {
 
     # Fix for xar 1.6.1+ (backported from LLVM trunk)
     ( cd "${srcdir}/llvm" && patch -p1 -i "${srcdir}/xar-1.6.patch" )
+
+    # Typo in build-script
+    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/build-script.patch" )
 }
 
 build() {
diff --git a/build-script.patch b/build-script.patch
new file mode 100644
index 000000000000..224974eae3b2
--- /dev/null
+++ b/build-script.patch
@@ -0,0 +1,12 @@
+diff -rupN a/utils/build-script-impl b/utils/build-script-impl
+--- a/utils/build-script-impl	2016-11-16 09:06:50.309942117 -0800
++++ b/utils/build-script-impl	2016-11-16 09:07:09.210159742 -0800
+@@ -827,7 +827,7 @@ function configure_default_options() {
+         local default_value="${KNOWN_SETTINGS[$((i+1))]}"
+ 
+         # Find the variable name in our lookup table.
+-        local varname="${known_setting_varnames[$((i/3))]]}"
++        local varname="${known_setting_varnames[$((i/3))]}"
+ 
+         # Establish the associative array mapping.
+         eval "${setting//-/_}_VARNAME=${varname}"