swift: update from 5.2.2 to 5.2.3

2020-04-30 17:26:12 +05:30 · 2020-04-30 17:26:12 +05:30 · f380827f81
commit f380827f81
parent 4b46218293
5 changed files with 38 additions and 66 deletions
--- a/packages/swift/build.sh
+++ b/packages/swift/build.sh
@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://www.swift.org/
 TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language"
 TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
-TERMUX_PKG_VERSION=5.2.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=5.2.3
 SWIFT_RELEASE="RELEASE"
-TERMUX_PKG_SHA256=92b0d1225e61a521ea10fe25f2cc35a2ad50ac55d1690d710f675d4db0c13b35
 TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz
+TERMUX_PKG_SHA256=609267142dee4dfc8e8b9486e70f825aa4ee8cd14ab8dd1c7aa670106ed58a4e
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="binutils-gold, libc++, ndk-sysroot, libandroid-glob, libandroid-spawn, libcurl, libicu, libicu-static, libsqlite, libuuid, libxml2, libdispatch, llbuild"
 TERMUX_PKG_BUILD_DEPENDS="cmake, ninja, perl, pkg-config, python2, rsync"
@ -16,11 +15,18 @@ SWIFT_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;swift-remo
 SWIFT_TOOLCHAIN_FLAGS="-R --no-assertions --llvm-targets-to-build='X86;ARM;AArch64' -j $TERMUX_MAKE_PROCESSES"
 SWIFT_PATH_FLAGS="--build-subdir=. --install-destdir=/ --install-prefix=$TERMUX_PREFIX"

-if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
+if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
+SWIFT_BUILD_FLAGS="--xctest -b -p --build-swift-static-sdk-overlay
+--build-swift-static-stdlib --swift-install-components='$SWIFT_COMPONENTS;stdlib;sdk-overlay'
+--install-libdispatch --install-foundation --install-xctest --install-swiftpm"
+else
 SWIFT_ANDROID_NDK_FLAGS="--android --android-ndk $TERMUX_STANDALONE_TOOLCHAIN --android-arch $TERMUX_ARCH
 --android-api-level $TERMUX_PKG_API_LEVEL --android-icu-uc $TERMUX_PREFIX/lib/libicuuc.so
 --android-icu-uc-include $TERMUX_PREFIX/include/ --android-icu-i18n $TERMUX_PREFIX/lib/libicui18n.so
 --android-icu-i18n-include $TERMUX_PREFIX/include/ --android-icu-data $TERMUX_PREFIX/lib/libicudata.so"
+SWIFT_BUILD_FLAGS="$SWIFT_ANDROID_NDK_FLAGS --build-toolchain-only
+--cross-compile-hosts=android-$TERMUX_ARCH --swift-install-components='$SWIFT_COMPONENTS'
+--build-swift-dynamic-stdlib=0 --build-swift-dynamic-sdk-overlay=0"
 fi

 termux_step_post_extract_package() {
@ -31,21 +37,14 @@ termux_step_post_extract_package() {
 		mv [a-zA-Z]* .temp/
 		mv .temp swift

-		if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-			termux_download \
-				https://swift.org/builds/swift-$TERMUX_PKG_VERSION-release/ubuntu1804/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE-ubuntu18.04.tar.gz \
-				$TERMUX_PKG_CACHEDIR/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE-ubuntu18.04.tar.gz \
-				c29afff6ebf3ca69a9b5a5621b9ffd7614626070eb982d4e7174a6d8352b6ce2
-		fi
-
 		declare -A library_checksums
-		library_checksums[swift-cmark]=0992aa8065beb88c8471e30e414a243be3e270b02b66e4c242ba741169baafe4
-		library_checksums[llvm-project]=2c30e793e4bc29dc396fab522bebda731bb25be0019b07f314e70139c94de552
-		library_checksums[swift-corelibs-libdispatch]=cae4ffc25cc3e349f63292cace22d922d81ac7f82f29d9ceac8c9210d04e662d
-		library_checksums[swift-corelibs-foundation]=e27590541c326e1f7a254070f87f0871b6593a6b206a8ef9be5c9af22c3d2e15
-		library_checksums[swift-corelibs-xctest]=5f93884c542552602d3a6bb2acd087aa5400bca68d9be79b4b1afd51fb8ca982
-		library_checksums[swift-llbuild]=b54ec43c58bf2fddfcc4e83fe744567f05274feb024dd2a39dba6b1badb49fac
-		library_checksums[swift-package-manager]=6d259436b1c09512e285187eb8794bbf550bdb513e243bc46e4790df0b1b9be8
+		library_checksums[swift-cmark]=7bb807e5fdb5706203eed156abb119c1636a3418700a9b81c086ac74b68c1e69
+		library_checksums[llvm-project]=a384315bb731d9a94bd1d0f3d5a93d66b3848a6d4809322d0fe4de8a06821535
+		library_checksums[swift-corelibs-libdispatch]=89b5910e80599d3168096f1dc9fb8883d6ecb042cdee144209f03b783249bdda
+		library_checksums[swift-corelibs-foundation]=e64e591e86a58d380352a2ef6943f32f90e761edf80dfe0d65d72f5d24ded226
+		library_checksums[swift-corelibs-xctest]=510038b1298fbc72da926e126dcffbe6bd34f34790d7c86c4f8b657d99d0f438
+		library_checksums[swift-llbuild]=fd53dcb75e6ae7b40248fbe9f0d7aebbde2472c422c3396750d512bc3ed57547
+		library_checksums[swift-package-manager]=7b7e8b06072cd7f183dc0da8252ab3dcb8ee8c0107c2074a3b504af7804233f5

 		for library in "${!library_checksums[@]}"; do \
 			termux_download \
@ -60,6 +59,13 @@ termux_step_post_extract_package() {
 		mv swift-llbuild llbuild
 		mv swift-package-manager swiftpm

+		if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
+			termux_download \
+				https://swift.org/builds/swift-$TERMUX_PKG_VERSION-release/ubuntu1804/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE-ubuntu18.04.tar.gz \
+				$TERMUX_PKG_CACHEDIR/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE-ubuntu18.04.tar.gz \
+				46e556fe215f0779da95acb7cfd80be5e31a26693f25349df4ebb1402b4ce285
+		fi
+
 		# The Swift compiler searches for the clang headers so symlink against them.
 		local TERMUX_CLANG_VERSION=$(grep ^TERMUX_PKG_VERSION= $TERMUX_PKG_BUILDER_DIR/../libllvm/build.sh | cut -f2 -d=)
 		sed "s%\@TERMUX_CLANG_VERSION\@%${TERMUX_CLANG_VERSION}%g" $TERMUX_PKG_BUILDER_DIR/swift-stdlib-public-SwiftShims-CMakeLists.txt | \
@ -91,10 +97,10 @@ termux_step_host_build() {
 		local CLANGXX=$(command -v clang++)

 		# The Ubuntu CI may not have clang/clang++ in its path so explicitly set it
-		# to clang-9 instead.
+		# to clang-10 instead.
 		if [ -z "$CLANG" ]; then
-			CLANG=$(command -v clang-9)
-			CLANGXX=$(command -v clang++-9)
+			CLANG=$(command -v clang-10)
+			CLANGXX=$(command -v clang++-10)
 		fi

 		# Natively compile llvm-tblgen and some other files needed later, and cross-compile
@ -117,8 +123,13 @@ termux_step_pre_configure() {
 		# A single patch needed from the existing llbuild package
 		patch -p1 < $TERMUX_PKG_BUILDER_DIR/../llbuild/lib-llvm-Support-CmakeLists.txt.patch

+		cd ../llvm-project
+		patch -p2 < $TERMUX_PKG_BUILDER_DIR/../libllvm/tools-clang-lib-Driver-ToolChain.cpp.patch
+		cd llvm
+		patch -p1 < $TERMUX_PKG_BUILDER_DIR/../libllvm/include-llvm-ADT-Triple.h.patch
+
 		if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-			cd ..
+			cd ../..
 			# Build patch needed only when cross-compiling the compiler.
 			sed "s%\@TERMUX_STANDALONE_TOOLCHAIN\@%${TERMUX_STANDALONE_TOOLCHAIN}%g" \
 			$TERMUX_PKG_BUILDER_DIR/swift-utils-build-script-impl | \
@ -129,20 +140,9 @@ termux_step_pre_configure() {
 }

 termux_step_make() {
-	if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
 	SWIFT_BUILD_ROOT=$TERMUX_PKG_BUILDDIR $TERMUX_PKG_SRCDIR/swift/utils/build-script \
-		$SWIFT_TOOLCHAIN_FLAGS $SWIFT_PATH_FLAGS --xctest -b -p --build-swift-static-stdlib \
-		--build-swift-static-sdk-overlay --llvm-install-components=IndexStore \
-		--install-swift --swift-install-components="$SWIFT_COMPONENTS;stdlib;sdk-overlay" \
-		--install-libdispatch --install-foundation --install-xctest --install-swiftpm
-	else
-		SWIFT_BUILD_ROOT=$TERMUX_PKG_BUILDDIR $TERMUX_PKG_SRCDIR/swift/utils/build-script \
-		$SWIFT_TOOLCHAIN_FLAGS $SWIFT_ANDROID_NDK_FLAGS $SWIFT_PATH_FLAGS \
-		--build-toolchain-only --cross-compile-hosts=android-$TERMUX_ARCH \
-		--build-swift-dynamic-stdlib=0 --build-swift-dynamic-sdk-overlay=0 \
-		--llvm-install-components=IndexStore --swift-install-components="$SWIFT_COMPONENTS" \
-		--install-swift
-	fi
+	$SWIFT_TOOLCHAIN_FLAGS $SWIFT_PATH_FLAGS --llvm-install-components=IndexStore \
+	--install-swift $SWIFT_BUILD_FLAGS
 }

 termux_step_make_install() {
--- a/packages/swift/llvm-project-clang-lib-Driver-ToolChain.cpp.patch
+++ b/packages/swift/llvm-project-clang-lib-Driver-ToolChain.cpp.patch
@ -1,11 +0,0 @@
--- a/llvm-project/clang/lib/Driver/ToolChain.cpp	2016-12-14 17:46:50.000000000 +0100
-+++ b/llvm-project/clang/lib/Driver/ToolChain.cpp	2017-07-13 12:35:02.862534376 +0200
-@@ -632,7 +632,7 @@
- 
-   switch (Type) {
-   case ToolChain::CST_Libcxx:
-    CmdArgs.push_back("-lc++");
-+    CmdArgs.push_back("-lc++_shared");
-     break;
- 
-   case ToolChain::CST_Libstdcxx:
--- a/packages/swift/llvm-project-llvm-include-llvm-ADT-Triple.h.patch
+++ b/packages/swift/llvm-project-llvm-include-llvm-ADT-Triple.h.patch
@ -1,15 +0,0 @@
-diff --git a/llvm-project/llvm/include/llvm/ADT/Triple.h b/llvm-project/llvm/include/llvm/ADT/Triple.h
-index 926039ca5982..0e4b55733f5e 100644
--- a/llvm-project/llvm/include/llvm/ADT/Triple.h
-+++ b/llvm-project/llvm/include/llvm/ADT/Triple.h
-@@ -666,6 +666,10 @@ public:
-     unsigned Env[3];
-     getEnvironmentVersion(Env[0], Env[1], Env[2]);
- 
-+    // If not specified, set a default Android API.
-+    if (Env[0] == 0)
-+      Env[0] = __ANDROID_API__;
-+
-     // 64-bit targets did not exist before API level 21 (Lollipop).
-     if (isArch64Bit() && Env[0] < 21)
-       Env[0] = 21;
--- a/packages/swift/swift-build-script.patch.beforehostbuild
+++ b/packages/swift/swift-build-script.patch.beforehostbuild
@ -20,14 +20,12 @@ diff --git a/swift/utils/gen-static-stdlib-link-args b/swift/utils/gen-static-st
 index 0fa009d67d3..abd98c2493f 100755
 --- a/swift/utils/gen-static-stdlib-link-args
 +++ b/swift/utils/gen-static-stdlib-link-args
-@@ -60,11 +60,8 @@ function write_linkfile {
+@@ -60,9 +60,8 @@ function write_linkfile {
     fi
     cat >$OUTPUTFILE <<EOF
 -ldl
 --lpthread
--latomic
 -lswiftCore
--latomic
 --lswiftImageInspectionShared
 +-llog
 $ICU_LIBS
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@ -110,7 +110,7 @@ PACKAGES+=" zlib1g-dev:i386"
 PACKAGES+=" llvm-8-tools"

 # For swift.
-PACKAGES+=" clang-9"
+PACKAGES+=" clang-10"
 PACKAGES+=" libtinfo5"
 PACKAGES+=" lld"