From b8bfe98f107189c57eef9c440ceb9c0962eb0036 Mon Sep 17 00:00:00 2001 From: Butta Date: Thu, 16 Jun 2022 13:53:15 +0530 Subject: [PATCH] upgpkg(swift): 5.6.1 to 5.6.2 Also, add a termux_setup_swift() bash function and move downloading the prebuilt Swift toolchain for linux there. --- build-package.sh | 4 +++ packages/swift/build.sh | 43 +++++++++-------------- scripts/build/setup/termux_setup_swift.sh | 42 ++++++++++++++++++++++ scripts/setup-offline-bundle.sh | 3 ++ 4 files changed, 65 insertions(+), 27 deletions(-) create mode 100644 scripts/build/setup/termux_setup_swift.sh diff --git a/build-package.sh b/build-package.sh index c1049bb063..20c9847f2d 100755 --- a/build-package.sh +++ b/build-package.sh @@ -86,6 +86,10 @@ source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_python_crossenv.sh" # shellcheck source=scripts/build/setup/termux_setup_rust.sh source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_rust.sh" +# Utility function for swift-using packages to setup a swift toolchain +# shellcheck source=scripts/build/setup/termux_setup_swift.sh +source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_swift.sh" + # Utility function for zig-using packages to setup a zig toolchain. # shellcheck source=scripts/build/setup/termux_setup_zig.sh source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_zig.sh" diff --git a/packages/swift/build.sh b/packages/swift/build.sh index ce87682138..eccaa15541 100644 --- a/packages/swift/build.sh +++ b/packages/swift/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://swift.org/ TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language" TERMUX_PKG_LICENSE="Apache-2.0, NCSA" TERMUX_PKG_MAINTAINER="@buttaface" -TERMUX_PKG_VERSION=5.6.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=5.6.2 SWIFT_RELEASE="RELEASE" TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz -TERMUX_PKG_SHA256=39e4e2b7343756e26627b945a384e1b828e38778b34cc5b0f3ecc23f18d22fd6 +TERMUX_PKG_SHA256=8176efb376e83b358cd088683e5214d8db864386dae745f94618745b1ab89a19 TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_DEPENDS="clang, libandroid-glob, libandroid-posix-semaphore, libandroid-spawn, libcurl, libicu, libicu-static, libsqlite, libuuid, libxml2, libdispatch, llbuild" TERMUX_PKG_BUILD_DEPENDS="rsync" @@ -24,10 +23,6 @@ SWIFT_TOOLCHAIN_FLAGS="-RA --llvm-targets-to-build='X86;ARM;AArch64' -j $TERMUX_ SWIFT_PATH_FLAGS="--build-subdir=. --install-destdir=/ --install-prefix=$TERMUX_PREFIX" SWIFT_BUILD_FLAGS="$SWIFT_TOOLCHAIN_FLAGS $SWIFT_PATH_FLAGS" -if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then - SWIFT_BIN="swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE-ubuntu20.04" - export SWIFT_BINDIR="$TERMUX_PKG_HOSTBUILD_DIR/$SWIFT_BIN/usr/bin" -fi SWIFT_ARCH=$TERMUX_ARCH test $SWIFT_ARCH == 'arm' && SWIFT_ARCH='armv7' @@ -39,21 +34,21 @@ termux_step_post_get_source() { mv .temp swift declare -A library_checksums - library_checksums[swift-cmark]=3a5c35b8018b079d99cae3305c9ede9c940aa298db0af92c418461fb0de289b6 - library_checksums[llvm-project]=24343a2a7059b7cfc25c0acc884ebf9296209440ac0fe5948e541b168d818777 - library_checksums[swift-corelibs-libdispatch]=856c9ffcf2ab2bbb28a6e0fa344277fc41aa0771419b283c7c4db69dad2b4cf9 - library_checksums[swift-corelibs-foundation]=21d28ad500279eb66bb8dc9e33e4c8036e1472f30e82eeb76329b69aa4b622fc - library_checksums[swift-corelibs-xctest]=6a2f6a81a5dd295578b2b80522313e36b4d3e51c828fe8210b1c84c2f66237ca - library_checksums[swift-llbuild]=3fe038b9b76a90803205d41f440eec46f21f23f42fd6f15be756b68907d04502 + library_checksums[swift-cmark]=931dafb52749313bd7cefd743e9624d2cf244d7581e5540e82e33a0f866fbb31 + library_checksums[llvm-project]=dc876801beb1bcbbea9d023ff2aba6381ca5e63ad6462327e2191acf10804eb8 + library_checksums[swift-corelibs-libdispatch]=ddf90b72521cf836e5ff6537a140fa08c4a3227f9d52d308cb4571c517030c76 + library_checksums[swift-corelibs-foundation]=fc7be74a20938f9249ca104b9610a6d6e79f5e243f33d789d9795c3f247c57fa + library_checksums[swift-corelibs-xctest]=4918429f4bc30b3cd8bd149096d56fd9f055c3ef82622934f64dddfa9aff9880 + library_checksums[swift-llbuild]=ba95bc71a20978bc5f411d10079de9ff228868f3fd9068d81b4be1998e5dc7d3 library_checksums[swift-argument-parser]=a4d4c08cf280615fe6e00752ef60e28e76f07c25eb4706a9269bf38135cd9c3f library_checksums[Yams]=8bbb28ef994f60afe54668093d652e4d40831c79885fa92b1c2cd0e17e26735a library_checksums[swift-crypto]=86d6c22c9f89394fd579e967b0d5d0b6ce33cdbf52ba70f82fa313baf70c759f library_checksums[swift-system]=865b8c380455eef27e73109835142920c60ae4c4f4178a3d12ad04acc83f1371 - library_checksums[swift-driver]=94c1eba97cdb71594d1f432d80a08d33578c9911f3968a8cb946e9d8bbe4d20f - library_checksums[swift-tools-support-core]=5fecacc1e35e659eee9aeafb0cb84b894f08c9094520fd56eb7e131b9eb5a991 - library_checksums[swift-package-manager]=0b375bbd0cc0b9296351064e0a012ca450675ce5021b2a029278463457026382 - library_checksums[indexstore-db]=3cf0eddc514f89b86b07bf479f39fc83ded3aa2bfeaaca2b48729142ff976426 - library_checksums[sourcekit-lsp]=a6f74d7bf4ee3615d4ac747a4b3747cfa8736b3d07274aeaba27f38886627cd7 + library_checksums[swift-driver]=97b515d684f26e9097bde7068e38f445898a8ab695478ca3ce64bc9969bc2fcb + library_checksums[swift-tools-support-core]=d14a30cfd9628a59a44011cce0465d9fcb1e55fc74e62d7f807c98e66ddb822c + library_checksums[swift-package-manager]=ea7eccebe14d84b9e12a8464a26acc2b8b094cd44eb1cc2c86c82d1ef5856c54 + library_checksums[indexstore-db]=6820ead230a04dc62c863f14a5db62ce8ba373257a4cb99e50096e32c83c9f5c + library_checksums[sourcekit-lsp]=e1c70a099eb981b967baaf9f788af439633027c86a8b27cd39039b5c41e86700 for library in "${!library_checksums[@]}"; do \ GH_ORG="apple" @@ -87,19 +82,13 @@ termux_step_post_get_source() { mv swift-llbuild llbuild mv Yams yams mv swift-package-manager swiftpm - - if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then - termux_download \ - https://download.swift.org/swift-$TERMUX_PKG_VERSION-release/ubuntu2004/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE/$SWIFT_BIN.tar.gz \ - $TERMUX_PKG_CACHEDIR/$SWIFT_BIN.tar.gz \ - 2b4f22d4a8b59fe8e050f0b7f020f8d8f12553cbda56709b2340a4a3bb90cfea - fi } termux_step_host_build() { if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then termux_setup_cmake termux_setup_ninja + termux_setup_swift local CLANG=$(command -v clang) local CLANGXX=$(command -v clang++) @@ -120,10 +109,9 @@ termux_step_host_build() { $SKIP_BUILD --skip-early-swift-driver --build-toolchain-only \ --host-cc=$CLANG --host-cxx=$CLANGXX - tar xf $TERMUX_PKG_CACHEDIR/$SWIFT_BIN.tar.gz -C $TERMUX_PKG_HOSTBUILD_DIR if [ "$TERMUX_ARCH" == "aarch64" ]; then rm $TERMUX_PKG_HOSTBUILD_DIR/swift-linux-x86_64/lib/swift/FrameworkABIBaseline - cp -r $SWIFT_BIN/usr/lib/swift $TERMUX_PKG_HOSTBUILD_DIR/swift-linux-x86_64/lib + cp -r $SWIFT_BINDIR/../lib/swift $TERMUX_PKG_HOSTBUILD_DIR/swift-linux-x86_64/lib ln -sf $SWIFT_BINDIR/../lib/clang/13.0.0 $TERMUX_PKG_HOSTBUILD_DIR/swift-linux-x86_64/lib/swift/clang fi fi @@ -139,6 +127,7 @@ termux_step_make() { export TERMUX_CLANG_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION) if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then + termux_setup_swift ln -sf $TERMUX_PKG_HOSTBUILD_DIR/llvm-linux-x86_64 $TERMUX_PKG_BUILDDIR/llvm-linux-x86_64 local SWIFT_TOOLCHAIN= diff --git a/scripts/build/setup/termux_setup_swift.sh b/scripts/build/setup/termux_setup_swift.sh new file mode 100644 index 0000000000..ea4b997efd --- /dev/null +++ b/scripts/build/setup/termux_setup_swift.sh @@ -0,0 +1,42 @@ +termux_setup_swift() { + if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then + local TERMUX_SWIFT_VERSION=$(. $TERMUX_SCRIPTDIR/packages/swift/build.sh; echo $TERMUX_PKG_VERSION) + local SWIFT_RELEASE=$(. $TERMUX_SCRIPTDIR/packages/swift/build.sh; echo $SWIFT_RELEASE) + local SWIFT_BIN="swift-$TERMUX_SWIFT_VERSION-$SWIFT_RELEASE-ubuntu20.04" + local SWIFT_FOLDER + + if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then + SWIFT_FOLDER=${TERMUX_SCRIPTDIR}/build-tools/${SWIFT_BIN} + else + SWIFT_FOLDER=${TERMUX_COMMON_CACHEDIR}/${SWIFT_BIN} + fi + + if [ ! -d "$SWIFT_FOLDER" ]; then + local SWIFT_TAR=$TERMUX_PKG_TMPDIR/${SWIFT_BIN}.tar.gz + termux_download \ + https://download.swift.org/swift-$TERMUX_SWIFT_VERSION-release/ubuntu2004/swift-$TERMUX_SWIFT_VERSION-$SWIFT_RELEASE/$SWIFT_BIN.tar.gz \ + $SWIFT_TAR \ + ac1c711985113d0d9daf7bf80205935a0688fb146546690d93c23df54d81cfb7 + + (cd $TERMUX_PKG_TMPDIR ; tar xf $SWIFT_TAR ; mv $SWIFT_BIN $SWIFT_FOLDER; rm $SWIFT_TAR) + fi + export SWIFT_BINDIR="$SWIFT_FOLDER/usr/bin" + else + if [[ "${TERMUX_APP_PACKAGE_MANAGER}" == "apt" ]] && "$(dpkg-query -W -f '${db:Status-Status}\n' swift 2>/dev/null)" != "installed" || + [[ "${TERMUX_APP_PACKAGE_MANAGER}" == "pacman" ]] && ! "$(pacman -Q swift 2>/dev/null)"; then + echo "Package 'swift' is not installed." + echo "You can install it with" + echo + echo " pkg install swift" + echo + echo " pacman -S swift" + echo + echo "or build it from source with" + echo + echo " ./build-package.sh swift" + echo + exit 1 + fi + export SWIFT_BINDIR="$TERMUX_PREFIX/bin" + fi +} diff --git a/scripts/setup-offline-bundle.sh b/scripts/setup-offline-bundle.sh index 11aacb53c7..160dfc1501 100755 --- a/scripts/setup-offline-bundle.sh +++ b/scripts/setup-offline-bundle.sh @@ -50,6 +50,9 @@ mkdir -p "$TERMUX_PKG_TMPDIR" #(. "$TERMUX_SCRIPTDIR"/scripts/build/setup/termux_setup_rust.sh # termux_setup_rust #) +(. "$TERMUX_SCRIPTDIR"/scripts/build/setup/termux_setup_swift.sh + termux_setup_swift +) (. "$TERMUX_SCRIPTDIR"/scripts/build/setup/termux_setup_zig.sh termux_setup_zig )