swift: enable package

Author: finagolfin

disabled-packages/swift/build.sh

@@ -0,0 +1,86 @@
+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.1.4
+TERMUX_PKG_SHA256=46765a6a604be0b11cb4660bf5adbef8a95d2b74b03aa46860ef81a5ba92d5e8
+TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-RELEASE.tar.gz
+TERMUX_PKG_DEPENDS="binutils-gold, libc++, ndk-sysroot, libandroid-spawn, libcurl, libicu, libsqlite, libuuid, libxml2, llbuild"
+TERMUX_PKG_BUILD_DEPENDS="cmake, ninja, perl, pkg-config, python2, rsync"
+TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686, x86_64"
+TERMUX_PKG_NO_STATICSPLIT=true
+
+SWIFT_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;license;sourcekit-inproc"
+SWIFT_BUILD_FLAGS="-R --no-assertions --llvm-targets-to-build='X86;ARM;AArch64'
+	--xctest -b -p -j $TERMUX_MAKE_PROCESSES --build-subdir=. --install-destdir=/
+	--install-prefix=$TERMUX_PREFIX --swift-install-components='$SWIFT_COMPONENTS'
+	--build-swift-static-stdlib --build-swift-static-sdk-overlay"
+
+termux_step_post_extract_package() {
+	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
+		termux_error_exit "Package '$TERMUX_PKG_NAME' is not ready for off-device builds."
+	fi
+
+	if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then
+		# The Swift build-script requires a particular organization of source directories,
+		# which the following sets up.
+		mkdir TEMP
+		mv [a-zA-S]* TEMP/
+		mv TEMP swift
+
+		declare -A library_checksums
+		library_checksums[swift-cmark]=dc02253fdc5ef4027551e5ab5cb8eef22abd7a5bb2df6a2baf02e17afdeeb5cd
+		library_checksums[llvm-project]=0b3606be7b542aff28210c96639ad19a4b982e999fb3e86748198d8150f5f3d3
+		library_checksums[swift-corelibs-libdispatch]=079cff5dd5b05381e9cf3094d445652fa9990a7d3a46e122f1e1dcdb2c54ddc1
+		library_checksums[swift-corelibs-foundation]=f6e09efb3998d0a3d449f92ea809c86346c66e3b2d83ed19f3335bcb29401416
+		library_checksums[swift-corelibs-xctest]=5996eb4384c8f095d912424439c5a1b7fc9ff57529f9ac5ecbc04e82d22ebca2
+		library_checksums[swift-llbuild]=537683d7f1a73b48017d7cd7cd587c4b75c55cc5584e206cc0f8f92f6f4dd3ea
+		library_checksums[swift-package-manager]=b421e7e171b94521e364b6ea21ddd6300fe28bce3a0fcbc9f5ed6db496f148a6
+
+		for library in "${!library_checksums[@]}"; do \
+			termux_download \
+				https://github.com/apple/$library/archive/swift-$TERMUX_PKG_VERSION-RELEASE.tar.gz \
+				$TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz \
+				${library_checksums[$library]}
+			tar xf $TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz
+		        mv $library-swift-${TERMUX_PKG_VERSION}-RELEASE $library
+		done
+
+		mv swift-cmark cmark
+
+		ln -s $PWD/llvm-project/llvm
+		ln -s $PWD/llvm-project/compiler-rt
+		ln -s $PWD/llvm-project/clang
+
+		mv swift-llbuild llbuild
+		mv swift-package-manager swiftpm
+	fi
+}
+
+termux_step_pre_configure() {
+	if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then
+		cd llbuild
+		# The bare minimum patches needed from the existing llbuild package
+		patch -p1 < $TERMUX_PKG_BUILDER_DIR/../llbuild/CMakeLists.txt.patch
+		patch -p1 < $TERMUX_PKG_BUILDER_DIR/../llbuild/include-llvm-Config-config.h.patch
+		patch -p1 < $TERMUX_PKG_BUILDER_DIR/../llbuild/lib-llvm-Support-CmakeLists.txt.patch
+	fi
+}
+
+termux_step_configure() {
+	ln -sf $(which python2) python
+	export PATH=$TERMUX_PKG_BUILDDIR:$PATH
+}
+
+termux_step_make() {
+	SWIFT_BUILD_ROOT=$TERMUX_PKG_BUILDDIR $TERMUX_PKG_SRCDIR/swift/utils/build-script \
+		$SWIFT_BUILD_FLAGS
+}
+
+termux_step_make_install() {
+	SWIFT_BUILD_ROOT=$TERMUX_PKG_BUILDDIR $TERMUX_PKG_SRCDIR/swift/utils/build-script \
+		$SWIFT_BUILD_FLAGS --install-swift --install-libdispatch --install-foundation \
+		--install-xctest --install-swiftpm --llvm-install-components=IndexStore
+
+	mkdir -p $TERMUX_PREFIX/lib/swift/pm/llbuild
+	cp llbuild-android-aarch64/lib/libllbuildSwift.so $TERMUX_PREFIX/lib/swift/pm/llbuild
+}

packages/swift/build.sh

@@ -56,15 +56,15 @@ index 68d7f5ddd88..5f6bfc2c57b 100755
      )
 
      # If we are asked to not generate test targets for LLVM and or Swift,
-@@ -2895,7 +2907,7 @@
+@@ -2894,6 +2894,8 @@ for host in "${ALL_HOSTS[@]}"; do
+               HOST_CXX_HEADERS_DIR="$HOST_CXX_DIR/../../usr/include/c++"
              elif [[ "$(uname -s)" == "Haiku" ]] ; then
                HOST_CXX_HEADERS_DIR="/boot/system/develop/headers/c++"
++            elif [[ "${ANDROID_DATA}" ]] ; then
++              HOST_CXX_HEADERS_DIR="$PREFIX/include/c++"
              else # Linux
--              HOST_CXX_HEADERS_DIR="/usr/include/c++"
-+              HOST_CXX_HEADERS_DIR="@TERMUX_PREFIX@/include/c++"
+               HOST_CXX_HEADERS_DIR="/usr/include/c++"
              fi
- 
-             # Find the path in which the local clang build is expecting to find
 @@ -3654,7 +3666,7 @@ for host in "${ALL_HOSTS[@]}"; do
                  fi
 
@@ -74,6 +74,23 @@ index 68d7f5ddd88..5f6bfc2c57b 100755
                    *)
                      echo "error: --install-xctest is not supported on this platform"
                      exit 1
+diff --git a/swift/utils/gen-static-stdlib-link-args b/swift/utils/gen-static-stdlib-link-args
+index a42c5e34a2e..430694ee30b 100755
+--- a/swift/utils/gen-static-stdlib-link-args
++++ b/swift/utils/gen-static-stdlib-link-args
+@@ -60,11 +60,10 @@ function write_linkfile {
+     fi
+     cat >$OUTPUTFILE <<EOF
+ -ldl
+--lpthread
+ -latomic
+ -lswiftCore
+ -latomic
+--lswiftImageInspectionShared
++-llog
+ $ICU_LIBS
+ -Xlinker
+ -export-dynamic
 diff --git a/swift/utils/swift_build_support/swift_build_support/targets.py b/swift/utils/swift_build_support/swift_build_support/targets.py
 index 7fae08ca57b..89637be0ee5 100644
 --- a/swift/utils/swift_build_support/swift_build_support/targets.py

disabled-packages/swift/llbuild-cmake-modules-Utility.cmake.patch renamed to packages/swift/llbuild-cmake-modules-Utility.cmake.patch

@@ -43,6 +43,18 @@ index 41768247e5..e67bf868ad 100644
  elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
 
    set(SWIFT_HOST_VARIANT "macosx" CACHE STRING
+@@ -1034,11 +1034,6 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
+   else()
+     set(SOURCEKIT_RUNTIME_DIR lib)
+   endif()
+-  swift_install_in_component(sourcekit-inproc
+-                             FILES
+-                               $<TARGET_FILE:dispatch>
+-                               $<TARGET_FILE:BlocksRuntime>
+-                             DESTINATION ${SOURCEKIT_RUNTIME_DIR})
+   if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
+     swift_install_in_component(sourcekit-inproc
+                                FILES
 diff --git a/swift/cmake/modules/AddSwift.cmake b/swift/cmake/modules/AddSwift.cmake
 index cbf613b4fc..47f926b4b8 100644
 --- a/swift/cmake/modules/AddSwift.cmake