swift-language-5.9.1-RELEASE.

2 files changed, 44 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16f03e36da8d..d0ffe9e7edf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 5.9
+	pkgver = 5.9.1
 	pkgrel = 1
-	url = https://swift.org/
+	url = https://github.com/apple/swift
 	arch = x86_64
 	license = apache2
 	makedepends = clang
@@ -22,42 +22,42 @@ pkgbase = swift-language
 	depends = libbsd
 	depends = ncurses
 	options = !strip
-	source = git+https://github.com/apple/swift#tag=swift-5.9-RELEASE
+	source = git+https://github.com/apple/swift#tag=swift-5.9.1-RELEASE
 	source = 0001-arch-aur-patches.patch
-	source = apple-llvm-project::git+https://github.com/apple/llvm-project#tag=swift-5.9-RELEASE
+	source = apple-llvm-project::git+https://github.com/apple/llvm-project#tag=swift-5.9.1-RELEASE
 	source = swift-argument-parser::git+https://github.com/apple/swift-argument-parser#tag=1.2.2
-	source = swift-cmark::git+https://github.com/apple/swift-cmark#tag=swift-5.9-RELEASE
-	source = swift-corelibs-foundation::git+https://github.com/apple/swift-corelibs-foundation#tag=swift-5.9-RELEASE
-	source = swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#tag=swift-5.9-RELEASE
-	source = swift-corelibs-xctest::git+https://github.com/apple/swift-corelibs-xctest#tag=swift-5.9-RELEASE
-	source = swift-driver::git+https://github.com/apple/swift-driver#tag=swift-5.9-RELEASE
-	source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests#tag=swift-5.9-RELEASE
-	source = swift-llbuild::git+https://github.com/apple/swift-llbuild#tag=swift-5.9-RELEASE
-	source = swift-package-manager::git+https://github.com/apple/swift-package-manager#tag=swift-5.9-RELEASE
-	source = swift-stress-tester::git+https://github.com/apple/swift-stress-tester#tag=swift-5.9-RELEASE
-	source = swift-syntax::git+https://github.com/apple/swift-syntax#tag=swift-5.9-RELEASE
-	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.9-RELEASE
-	source = apple-indexstore-db::git+https://github.com/apple/indexstore-db#tag=swift-5.9-RELEASE
-	source = apple-sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#tag=swift-5.9-RELEASE
+	source = swift-cmark::git+https://github.com/apple/swift-cmark#tag=swift-5.9.1-RELEASE
+	source = swift-corelibs-foundation::git+https://github.com/apple/swift-corelibs-foundation#tag=swift-5.9.1-RELEASE
+	source = swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#tag=swift-5.9.1-RELEASE
+	source = swift-corelibs-xctest::git+https://github.com/apple/swift-corelibs-xctest#tag=swift-5.9.1-RELEASE
+	source = swift-driver::git+https://github.com/apple/swift-driver#tag=swift-5.9.1-RELEASE
+	source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests#tag=swift-5.9.1-RELEASE
+	source = swift-llbuild::git+https://github.com/apple/swift-llbuild#tag=swift-5.9.1-RELEASE
+	source = swift-package-manager::git+https://github.com/apple/swift-package-manager#tag=swift-5.9.1-RELEASE
+	source = swift-stress-tester::git+https://github.com/apple/swift-stress-tester#tag=swift-5.9.1-RELEASE
+	source = swift-syntax::git+https://github.com/apple/swift-syntax#tag=swift-5.9.1-RELEASE
+	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.9.1-RELEASE
+	source = apple-indexstore-db::git+https://github.com/apple/indexstore-db#tag=swift-5.9.1-RELEASE
+	source = apple-sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#tag=swift-5.9.1-RELEASE
 	source = swift-asn1::git+https://github.com/apple/swift-asn1#tag=0.7.0
 	source = swift-atomics::git+https://github.com/apple/swift-atomics#tag=1.0.2
 	source = swift-certificates::git+https://github.com/apple/swift-certificates#tag=0.4.1
-	source = swift-cmark-gfm::git+https://github.com/apple/swift-cmark#tag=swift-5.9-RELEASE
+	source = swift-cmark-gfm::git+https://github.com/apple/swift-cmark#tag=swift-5.9.1-RELEASE
 	source = swift-collections::git+https://github.com/apple/swift-collections#tag=1.0.1
 	source = swift-crypto::git+https://github.com/apple/swift-crypto#tag=2.5.0
-	source = swift-docc::git+https://github.com/apple/swift-docc#tag=swift-5.9-RELEASE
-	source = swift-docc-render-artifact::git+https://github.com/apple/swift-docc-render-artifact#tag=swift-5.9-RELEASE
-	source = swift-docc-symbolkit::git+https://github.com/apple/swift-docc-symbolkit#tag=swift-5.9-RELEASE
-	source = swift-format::git+https://github.com/apple/swift-format#tag=swift-5.9-RELEASE
-	source = swift-installer-scripts::git+https://github.com/apple/swift-installer-scripts#tag=swift-5.9-RELEASE
-	source = swift-lmdb::git+https://github.com/apple/swift-lmdb#tag=swift-5.9-RELEASE
-	source = swift-markdown::git+https://github.com/apple/swift-markdown#tag=swift-5.9-RELEASE
+	source = swift-docc::git+https://github.com/apple/swift-docc#tag=swift-5.9.1-RELEASE
+	source = swift-docc-render-artifact::git+https://github.com/apple/swift-docc-render-artifact#tag=swift-5.9.1-RELEASE
+	source = swift-docc-symbolkit::git+https://github.com/apple/swift-docc-symbolkit#tag=swift-5.9.1-RELEASE
+	source = swift-format::git+https://github.com/apple/swift-format#tag=swift-5.9.1-RELEASE
+	source = swift-installer-scripts::git+https://github.com/apple/swift-installer-scripts#tag=swift-5.9.1-RELEASE
+	source = swift-lmdb::git+https://github.com/apple/swift-lmdb#tag=swift-5.9.1-RELEASE
+	source = swift-markdown::git+https://github.com/apple/swift-markdown#tag=swift-5.9.1-RELEASE
 	source = swift-nio::git+https://github.com/apple/swift-nio#tag=2.31.2
 	source = swift-nio-ssl::git+https://github.com/apple/swift-nio-ssl#tag=2.15.0
 	source = swift-numerics::git+https://github.com/apple/swift-numerics#tag=1.0.1
 	source = swift-system::git+https://github.com/apple/swift-system#tag=1.1.1
-	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.9-RELEASE
-	source = swift-xcode-playground-support::git+https://github.com/apple/swift-xcode-playground-support#tag=swift-5.9-RELEASE
+	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.9.1-RELEASE
+	source = swift-xcode-playground-support::git+https://github.com/apple/swift-xcode-playground-support#tag=swift-5.9.1-RELEASE
 	source = yams::git+https://github.com/jpsim/Yams#tag=5.0.1
 	sha256sums = SKIP
 	sha256sums = 3941d6e2ff26ee0bf2d0ae37ed618d1cb36af85e256b0b84dd4e5d8549ec2982
diff --git a/PKGBUILD b/PKGBUILD
index 1d890a53ec61..a4c781145522 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,13 @@
 
 _pkgname="swift-language"
 pkgname="$_pkgname"
-_swiftver=swift-5.9-RELEASE
-pkgver=5.9
+_swiftver=swift-5.9.1-RELEASE
+pkgver=5.9.1
 pkgrel=1
 pkgdesc="The Swift programming language and debugger"
 arch=('x86_64')
-url="https://swift.org/"
+#url="https://swift.org/"
+url="https://github.com/apple/swift"
 license=('apache2')
 depends=('icu' 'libedit' 'libxml2' 'python' 'libbsd' 'ncurses')
 makedepends=('clang' 'cmake' 'git' 'lld' 'llvm' 'ninja' 'patch' 'python-six' 'rsync' 'swig')
@@ -146,21 +147,27 @@ prepare () {
     ln -sfP 'swift-tools-support-core' 'tools-support-core'
     ln -sfP 'swift-xcode-playground-support' 'xcode-playground-support'
 
-    ( cd swift && patch -Np1 -F100 -i "${srcdir:?}/0001-arch-aur-patches.patch" )
+    # ( cd swift && patch -Np1 -F100 -i "${srcdir:?}/0001-arch-aur-patches.patch" )
 }
 
 build() {
     # Fix /usr/include error
-    find "${srcdir:?}/swift/stdlib/public/SwiftShims" -type f -print0 | xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
-    find "${srcdir:?}/apple-llvm-project/clang" -type f -print0 | xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
-    find "${srcdir:?}/apple-llvm-project/clang-tools-extra" -type f -print0 | xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
+    find "${srcdir:?}/swift" -type f -print0 \
+        | xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
+    find "${srcdir:?}/apple-llvm-project" -type f -print0 \
+        | xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
 
     # By default in /etc/makepkg.conf this is "-D_FORTIFY_SOURCE=2"
     # Which will break `compiler-rt`
-    unset CPPFLAGS
-    export DISTCC_HOSTS='--randomize localhost red,cpp,lzo green,cpp,lzo blue,cpp,lzo'
+    CFLAGS=$(sed -E 's&\s\S*D_FORTIFY_SOURCE\S*\s& &; s&\s+& &g' <<< "$CFLAGS")
+    CXXFLAGS=$(sed -E 's&\s\S*D_FORTIFY_SOURCE\S*\s& &; s&\s+& &g' <<< "$CFLAGS")
+    # unset CPPFLAGS
+    # export DISTCC_HOSTS='--randomize localhost red,cpp,lzo green,cpp,lzo blue,cpp,lzo'
 
-    python swift/utils/build-script --preset=buildbot_linux,no_test install_destdir="${srcdir:?}/destdir"
+    "${srcdir:?}/swift/utils/build-script" \
+        --release-debuginfo \
+        --skip-early-swift-driver \
+        --skip-early-swiftsyntax
 }
 
 package() {