Partially working update to 3.1

6 files changed, 54 insertions, 181 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f024aaa1e3e7..639edbf4e6f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jan 18 18:30:02 UTC 2017
+# Fri Apr  7 05:29:10 UTC 2017
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 3.0.2
+	pkgver = 3.1
 	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = swift-language
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = swig
-	makedepends = clang=3.8.1
+	makedepends = clang>=3.9
 	makedepends = python2-six
 	makedepends = perl
 	makedepends = python2-sphinx
@@ -26,36 +26,28 @@ pkgbase = swift-language
 	depends = sqlite
 	depends = ncurses
 	depends = libkqueue
-	source = swift-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-llvm-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-clang-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-lldb-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-cmark-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-llbuild-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-package-manager-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-corelibs-xctest-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-corelibs-foundation-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-corelibs-libdispatch-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-integration-tests-3.0.2-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-3.0.2-RELEASE.tar.gz
-	source = swift-sphinx2.patch
-	source = xar-1.6.patch
-	source = build-script.patch
-	source = swift-init-CachedVFile.patch
-	sha256sums = e69764cb3d83d7209f21c2af448ae39e6612df28e37b7a3ceffa9c24f19ca0cc
-	sha256sums = 194f66f522aa349061ae682bab18fa3fffe146da30e30f2d9f4b811fd544f8eb
-	sha256sums = 8c9026b6f7543fc4ad2efef412da8ab186dbbcb089e8558e27b9994243faff99
-	sha256sums = 2d3f8e9f9d388fd77281318b07079f552fa47c795d8c00ca6a96031991094ea3
-	sha256sums = 40fc49d2f1c4075030b43f706193c1e6323e741ac5b029d2c627fd2f86da1cb4
-	sha256sums = ff96888b203cca45bc9b23e01221550faa21581fded9015bf885da836c19ae95
-	sha256sums = 21b3192ffa8625e55b0d69f17418047c347acc67e5be476f4f93ca079a03c84f
-	sha256sums = 4489de54204c5788837059474a1f3c7feaab0bea8753c3b67a4a04bc0732965d
-	sha256sums = 42a25c90ff6249427baf27cd7f9e676430cbde73f228ea346b9ef8c7ddaa86eb
-	sha256sums = a6ec06cefdea3226e47578477559bea43733fbc0362616c08ae3cb9deea8aa79
-	sha256sums = 90cb9573f22ed62d49ffff4de0e92fefdb3044a7e19391bbc14a63cc4f0ca27b
-	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
-	sha256sums = df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6
-	sha256sums = 9f2512df8c495e2b8bf19fe213e951cdd17df9207538ceb8ab59a30bd6a18e3f
-	sha256sums = 2543e6b4ee21e090eb7f67e07594ac95122eb5b275e1976ededa9ef71f3d8652
+	source = swift-3.1-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-llvm-3.1-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-clang-3.1-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-lldb-3.1-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-cmark-3.1-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-llbuild-3.1-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-package-manager-3.1-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-corelibs-xctest-3.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-corelibs-foundation-3.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-corelibs-libdispatch-3.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-3.1-RELEASE.tar.gz
+	source = swift-integration-tests-3.1-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-3.1-RELEASE.tar.gz
+	sha256sums = bc8f4fc1cb5e9cddcdca4208dc5db89696d6ab507e739d498519a0262bd453c0
+	sha256sums = 5f99110ac0fcd70b7fabf02989cfd0e7f1f1b6368b80d69f1506ce1fdc38c83e
+	sha256sums = bb4543904e82f433a6a65612c9c4d8218dc5358f8097318f4f7fd6af145dd1f5
+	sha256sums = eb10951a920b16fefccec73f919c9fc222973164b6d922a1084770b9bb822958
+	sha256sums = f0906c6048cdc93c85106090a878dea7ca3b6d862091f82fe8073e273d3fc011
+	sha256sums = 578c0d28fc74df52c77dd6c1bfc91e45f0d9d2349e82855ae2f9715d1b25ac36
+	sha256sums = 54e66ff2fbe06011207e07a75807b9c0d317355c655c1d74580411e705f2b824
+	sha256sums = fb52ec66d67b2c2005fd19a7a7f23cb8a6a077c9595d1514001b26690239814b
+	sha256sums = 82866426aae326fb910787080ad1a994061e0da410ee5bd0a2911b9fec603e53
+	sha256sums = 859742ac51832918e4400f06414ac33a3c65584681626e7e90a1b2b8eb514b1b
+	sha256sums = 81677333d13bbac8b324db8c223917475e0dc229026b12e4be425d9d2899fb28
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index b0e877af7365..83008a131d0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=swift-language
 pkgname=(swift swift-lldb)
-_swiftver=3.0.2-RELEASE
+_swiftver=3.1-RELEASE
 pkgver=${_swiftver//-RELEASE/}
 pkgrel=1
 pkgdesc="The Swift programming language and debugger"
@@ -11,7 +11,7 @@ url="http://swift.org/"
 license=('apache')
 depends=('python2' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
          'sqlite' 'ncurses' 'libkqueue')
-makedepends=('git' 'cmake' 'ninja' 'swig' 'clang=3.8.1' 'python2-six' 'perl'
+makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.9' 'python2-six' 'perl'
              'python2-sphinx' 'python2-requests')
 
 source=(
@@ -26,24 +26,20 @@ 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" "build-script.patch"
-    "swift-init-CachedVFile.patch"
+    "block_include.patch"
 )
-sha256sums=('e69764cb3d83d7209f21c2af448ae39e6612df28e37b7a3ceffa9c24f19ca0cc'
-            '194f66f522aa349061ae682bab18fa3fffe146da30e30f2d9f4b811fd544f8eb'
-            '8c9026b6f7543fc4ad2efef412da8ab186dbbcb089e8558e27b9994243faff99'
-            '2d3f8e9f9d388fd77281318b07079f552fa47c795d8c00ca6a96031991094ea3'
-            '40fc49d2f1c4075030b43f706193c1e6323e741ac5b029d2c627fd2f86da1cb4'
-            'ff96888b203cca45bc9b23e01221550faa21581fded9015bf885da836c19ae95'
-            '21b3192ffa8625e55b0d69f17418047c347acc67e5be476f4f93ca079a03c84f'
-            '4489de54204c5788837059474a1f3c7feaab0bea8753c3b67a4a04bc0732965d'
-            '42a25c90ff6249427baf27cd7f9e676430cbde73f228ea346b9ef8c7ddaa86eb'
-            'a6ec06cefdea3226e47578477559bea43733fbc0362616c08ae3cb9deea8aa79'
-            '90cb9573f22ed62d49ffff4de0e92fefdb3044a7e19391bbc14a63cc4f0ca27b'
-            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f'
-            'df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6'
-            '9f2512df8c495e2b8bf19fe213e951cdd17df9207538ceb8ab59a30bd6a18e3f'
-            '2543e6b4ee21e090eb7f67e07594ac95122eb5b275e1976ededa9ef71f3d8652')
+sha256sums=('bc8f4fc1cb5e9cddcdca4208dc5db89696d6ab507e739d498519a0262bd453c0'
+            '5f99110ac0fcd70b7fabf02989cfd0e7f1f1b6368b80d69f1506ce1fdc38c83e'
+            'bb4543904e82f433a6a65612c9c4d8218dc5358f8097318f4f7fd6af145dd1f5'
+            'eb10951a920b16fefccec73f919c9fc222973164b6d922a1084770b9bb822958'
+            'f0906c6048cdc93c85106090a878dea7ca3b6d862091f82fe8073e273d3fc011'
+            '578c0d28fc74df52c77dd6c1bfc91e45f0d9d2349e82855ae2f9715d1b25ac36'
+            '54e66ff2fbe06011207e07a75807b9c0d317355c655c1d74580411e705f2b824'
+            'fb52ec66d67b2c2005fd19a7a7f23cb8a6a077c9595d1514001b26690239814b'
+            '82866426aae326fb910787080ad1a994061e0da410ee5bd0a2911b9fec603e53'
+            '859742ac51832918e4400f06414ac33a3c65584681626e7e90a1b2b8eb514b1b'
+            '81677333d13bbac8b324db8c223917475e0dc229026b12e4be425d9d2899fb28'
+            'e89716c7a5bc047eddac22e7633804108c0e3c6d543c3005dec5e9b9334fb1c3')
 
 prepare() {
     # Use python2 where appropriate
@@ -70,18 +66,9 @@ prepare() {
     ln -sf swift-swift-${_swiftver} swift
     ln -sf swift-package-manager-swift-${_swiftver} swiftpm
 
-    # Sphinx 1.3.5 raises a warning (promoted to error) when using an unknown
-    # syntax highlighting language (like "swift").
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-sphinx2.patch" )
-
-    # 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" )
-
-    # Fix for missing initialization
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-init-CachedVFile.patch" )
+    # Fix some broken includes in foundation lib
+    ( cd "${srcdir}/swift-corelibs-foundation" && \
+        patch -p1 -i "${srcdir}/block_include.patch" )
 }
 
 build() {
@@ -90,9 +77,15 @@ build() {
     export SWIFT_SOURCE_ROOT="$srcdir"
     export LDFLAGS='-ldl -lpthread'
     export PATH="$PATH:/usr/bin/core_perl"
-    utils/build-script -R \
-        --lldb --llbuild --swiftpm --xctest --foundation --libdispatch \
-        -j "$(lscpu --parse=CPU | grep -v '^#' | wc -l)"
+    _cpus="$(lscpu --parse=CPU | grep -v '^#' | wc -l)"
+    utils/build-script -R -j "$_cpus" \
+        --lldb --llbuild --swiftpm --xctest --foundation --libdispatch
+
+    # Fix the lldb swig binding's import path (matches Arch LLDB package)
+    # Need to do this before check(), since the test suite uses the lldb
+    # python bindings directly from the build dir
+    sed -i "/import_module('_lldb')/s/_lldb/lldb.&/" \
+        "${srcdir}/build/Ninja-ReleaseAssert/lldb-linux-${CARCH}/lib/python2.7/site-packages/lldb/__init__.py"
 }
 
 check() {
@@ -133,7 +126,7 @@ package_swift() {
     )
     (
         cd swiftpm-linux-$CARCH
-        install -m755 debug/swift-{build,test,package} "$pkgdir/usr/bin"
+        install -m755 release/swift-{build,test,package} "$pkgdir/usr/bin"
 
         install -dm755 "$pkgdir/usr/lib/swift/pm"
         install -m755 lib/swift/pm/libPackageDescription.so "$pkgdir/usr/lib/swift/pm"
@@ -181,4 +174,5 @@ package_swift-lldb() {
 
     # This should be provided from python2-six
     rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"
+    rm "$pkgdir/usr/lib/python2.7/site-packages/six.pyc"
 }
diff --git a/build-script.patch b/build-script.patch
deleted file mode 100644
index 224974eae3b2..000000000000
--- a/build-script.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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}"
diff --git a/swift-init-CachedVFile.patch b/swift-init-CachedVFile.patch
deleted file mode 100644
index 37e38edee65c..000000000000
--- a/swift-init-CachedVFile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 09cbffb3e4ed5c4ef8069d273e2d34309abcd2e4 Mon Sep 17 00:00:00 2001
-From: Mishal Shah <mishal_shah@apple.com>
-Date: Fri, 14 Oct 2016 15:29:18 -0700
-Subject: [PATCH] Initialize CachedVFile with nullptr
-
----
- include/swift/Basic/SourceManager.h | 2 +-
- lib/Basic/SourceLoc.cpp             | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/swift/Basic/SourceManager.h b/include/swift/Basic/SourceManager.h
-index 1072b8b..e5149f1 100644
---- a/include/swift/Basic/SourceManager.h
-+++ b/include/swift/Basic/SourceManager.h
-@@ -40,7 +40,7 @@ class SourceManager {
-     int LineOffset;
-   };
-   std::map<const char *, VirtualFile> VirtualFiles;
--  mutable std::pair<const char *, const VirtualFile*> CachedVFile = {};
-+  mutable std::pair<const char *, const VirtualFile*> CachedVFile = {nullptr, nullptr};
- 
- public:
-   llvm::SourceMgr &getLLVMSourceMgr() {
-diff --git a/lib/Basic/SourceLoc.cpp b/lib/Basic/SourceLoc.cpp
-index 9bc484c..b6e0873 100644
---- a/lib/Basic/SourceLoc.cpp
-+++ b/lib/Basic/SourceLoc.cpp
-@@ -82,7 +82,7 @@ bool SourceManager::openVirtualFile(SourceLoc loc, StringRef name,
- 
-   CharSourceRange range = CharSourceRange(*this, loc, end);
-   VirtualFiles[end.Value.getPointer()] = { range, name, lineOffset };
--  CachedVFile = {};
-+  CachedVFile = {nullptr, nullptr};
-   return true;
- }
- 
-@@ -99,7 +99,7 @@ void SourceManager::closeVirtualFile(SourceLoc end) {
- #endif
-     return;
-   }
--  CachedVFile = {};
-+  CachedVFile = {nullptr, nullptr};
- 
-   CharSourceRange oldRange = virtualFile->Range;
-   virtualFile->Range = CharSourceRange(*this, virtualFile->Range.getStart(),
diff --git a/swift-sphinx2.patch b/swift-sphinx2.patch
deleted file mode 100644
index ca37917232e4..000000000000
--- a/swift-sphinx2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- a/docs/CMakeLists.txt	2016-06-01 09:50:24.174184477 -0700
-+++ b/docs/CMakeLists.txt	2016-06-01 09:51:02.687901780 -0700
-@@ -1,7 +1,7 @@
- add_subdirectory(tools)
- 
- find_program(SPHINX_EXECUTABLE
--  NAMES sphinx-build
-+  NAMES sphinx-build2
-   HINTS $ENV{SPHINX_DIR}
-   PATH_SUFFIXES bin
-   DOC "Sphinx documentation generator")
-@@ -10,7 +10,6 @@ SET(SWIFT_SPHINX_PAPER_SIZE "letter"
-   CACHE STRING "Paper size for generated documentation")
- 
- SET(SPHINX_ARGS
--  -W
-   -D latex_paper_size=${SWIFT_SPHINX_PAPER_SIZE}
-   -d ${CMAKE_BINARY_DIR}/doctrees)
- 
diff --git a/xar-1.6.patch b/xar-1.6.patch
deleted file mode 100644
index 21738871ae44..000000000000
--- a/xar-1.6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f0a99b9f6860044e045b874549928c148087b626 Mon Sep 17 00:00:00 2001
-From: Kevin Enderby <enderby@apple.com>
-Date: Mon, 23 May 2016 22:18:59 +0000
-Subject: [PATCH] Tweak to change in r270491 to deal with the
- lld-x86_64-darwin13 bot having a old xar.h header. Reviewed the change with
- Chris Bieneman and Pete Cooper.
-
-git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@270502 91177308-0d34-0410-b5e6-96231b3b80d8
----
- tools/llvm-objdump/MachODump.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
-index 2bafe55..b97cdca 100644
---- a/tools/llvm-objdump/MachODump.cpp
-+++ b/tools/llvm-objdump/MachODump.cpp
-@@ -5873,12 +5873,16 @@ static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
-       case XAR_CKSUM_MD5:
-         outs() << "XAR_CKSUM_MD5\n";
-         break;
-+#ifdef XAR_CKSUM_SHA256
-       case XAR_CKSUM_SHA256:
-         outs() << "XAR_CKSUM_SHA256\n";
-         break;
-+#endif
-+#ifdef XAR_CKSUM_SHA512
-       case XAR_CKSUM_SHA512:
-         outs() << "XAR_CKSUM_SHA512\n";
-         break;
-+#endif
-       default:
-         outs() << XarHeader.cksum_alg << "\n";
-     }
--- 
-2.7.4
-