swift: update from 6.0.3 to devel 6.1 Dec 21 snapshot

finagolfin · Dec 27, 2024 · 2730f1a · 2730f1a
1 parent f4e4fe5
commit 2730f1a
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 1,744 deletions.
diff --git a/packages/libdispatch/build.sh b/packages/libdispatch/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/swiftlang/swift-corelibs-libdispatch
 TERMUX_PKG_DESCRIPTION="The libdispatch project, for concurrency on multicore hardware"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@finagolfin"
-TERMUX_PKG_VERSION="1:6.0.2"
-TERMUX_PKG_SRCURL=https://github.com/swiftlang/swift-corelibs-libdispatch/archive/swift-${TERMUX_PKG_VERSION:2}-RELEASE.tar.gz
-TERMUX_PKG_SHA256=3df429b22d9294c0ca5291c86e83a35f6326600a1c271933107bba199b919008
+TERMUX_PKG_VERSION="1:6.1"
+TERMUX_PKG_SRCURL=https://github.com/swiftlang/swift-corelibs-libdispatch/archive/swift-${TERMUX_PKG_VERSION:2}-DEVELOPMENT-SNAPSHOT-2024-12-21-a.tar.gz
+TERMUX_PKG_SHA256=c82d30b233edef0a202fbd54cbad4a5c210758e4f7191a2f47d1d59e8bf52457
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="libc++, libblocksruntime"
diff --git a/packages/llbuild/build.sh b/packages/llbuild/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/swiftlang/swift-llbuild
 TERMUX_PKG_DESCRIPTION="A low-level build system, used by the Swift Package Manager"
 TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
 TERMUX_PKG_MAINTAINER="@finagolfin"
-TERMUX_PKG_VERSION=6.0.2
-TERMUX_PKG_SRCURL=https://github.com/swiftlang/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-RELEASE.tar.gz
-TERMUX_PKG_SHA256=40ada0511f0218fb3ca0478c8fff1b4d0958478056a0cc5408677753e8c8f7a7
+TERMUX_PKG_VERSION=6.1
+TERMUX_PKG_SRCURL=https://github.com/swiftlang/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-DEVELOPMENT-SNAPSHOT-2024-12-21-a.tar.gz
+TERMUX_PKG_SHA256=9aabed380281cf39da22c74309f49826257d7f661c5234d21b6059a56ce963f0
 TERMUX_PKG_DEPENDS="libc++, libandroid-spawn, libsqlite"
 TERMUX_PKG_NO_STATICSPLIT=true
diff --git a/packages/swift/build.sh b/packages/swift/build.sh
@@ -2,13 +2,13 @@ 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="@finagolfin"
-TERMUX_PKG_VERSION=6.0.3
-SWIFT_RELEASE="RELEASE"
+TERMUX_PKG_VERSION=6.1
+SWIFT_RELEASE="DEVELOPMENT-SNAPSHOT-2024-12-21-a"
 TERMUX_PKG_SRCURL=https://github.com/swiftlang/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz
-TERMUX_PKG_SHA256=eef9f312d00540cfabc35cb1da9221dd15d3aaca546497a14f29a641ee6484e3
+TERMUX_PKG_SHA256=eac914aa8f1732fe92bbb33de22bbd1a83acde2b5d1f8308f135ae9d50b4a0d2
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_DEPENDS="clang, libandroid-execinfo, libandroid-glob, libandroid-posix-semaphore, libandroid-shmem, libandroid-spawn, libandroid-spawn-static, libandroid-sysv-semaphore, libcurl, libsqlite, libuuid, libxml2, libdispatch, llbuild, pkg-config, swift-sdk-${TERMUX_ARCH/_/-}"
+TERMUX_PKG_DEPENDS="clang, libandroid-execinfo, libandroid-glob, libandroid-posix-semaphore, libandroid-shmem, libandroid-spawn, libandroid-spawn-static, libandroid-sysv-semaphore, libcurl, libuuid, libxml2, libdispatch, llbuild, pkg-config, swift-sdk-${TERMUX_ARCH/_/-}"
 TERMUX_PKG_BUILD_DEPENDS="rsync"
 TERMUX_PKG_BLACKLISTED_ARCHES="i686"
 TERMUX_PKG_NO_STATICSPLIT=true
@@ -42,33 +42,34 @@ termux_step_post_get_source() {
 	mv .temp swift
 
 	declare -A library_checksums
-	library_checksums[swift-cmark]=ab1064350ecedd5b3c0f2a6fbe3acefbc45d7accf1e4ca1591ce04d0c6787e40
-	library_checksums[llvm-project]=d93ca164615938e5026a2d1af76b2ef7514eae98b38a716f3278bc1a6dfc8f92
-	library_checksums[swift-experimental-string-processing]=6c34cfdf934eb781169866a66505e11541861ba638b05fd4ed87f8c34a6fa55e
-	library_checksums[swift-syntax]=30788e115f37b7d3f8fc1f5d436b80996f4945fc13287ed7e4391b358479fafd
-	library_checksums[swift-corelibs-libdispatch]=444c0de5fe18e148548a3f3b60b3bac3d4d586285c21064346c7ca17ed1d4fac
-	library_checksums[swift-corelibs-foundation]=62c276a18fa3b3b92e95f5349dc125d03f09cea3c477b3af1428ccdbab29e139
-	library_checksums[swift-foundation]=31ee3ea95a015049d3f6a5cfe8bd3a460071fa0086c1d112efaf0580611d162c
-	library_checksums[swift-foundation-icu]=c4332b4e6cc008a5a7045ad7f368df7deb518f286ecd5a78839066dcc07a853a
-	library_checksums[swift-corelibs-xctest]=eb131d1cfde18548c5fc782ba56bc871b13057b5e7b6992ddae4d4349360571d
-	library_checksums[swift-llbuild]=68d71bf7e0882153c6ad91fbe0626ab761d8bc46d2d93ce32cbfa392d256a30e
-	library_checksums[swift-argument-parser]=4a10bbef290a2167c5cc340b39f1f7ff6a8cf4e1b5433b68548bf5f1e542e908
-	library_checksums[Yams]=a81c6b93f5d26bae1b619b7f8babbfe7c8abacf95b85916961d488888df886fb
-	library_checksums[swift-collections]=cd30d2f93c72424df48d182006417abdeebe74d250cb99d1cda78daf40aca569
-	library_checksums[swift-crypto]=5c860c0306d0393ff06268f361aaf958656e1288353a0e23c3ad20de04319154
+	library_checksums[sourcekit-lsp]=e56ca56097ed4f164db1d985c7ad67b4ece0d5841b63bff959f85fc9ff46dff4
+	library_checksums[swift-corelibs-xctest]=4efa2f1a5463c47add144191200c2a3d1b11dcfe84f2b80883f35d0b36526fea
+	library_checksums[swift-corelibs-foundation]=211122a6b1bebfd3f80b1b5f74b53ac1a9c14d38dbf49b9627feffa6772cefd8
+	library_checksums[swift-collections]=7e5e48d0dc2350bed5919be5cf60c485e72a30bd1f2baf718a619317677b91db
+	library_checksums[swift-driver]=4624a3b66b92e43bef9cd5b2e8eb81a21aa5c749e9650a1cad38f5987d88b289
+	library_checksums[swift-foundation]=5e530d3f15423586d841aca7f5f05d72aa0dcc4bd9704d212ee64e05ed84d3b8
+	library_checksums[swift-toolchain-sqlite]=c8704e70c4847a8dbd47aafb25d293fbe1e1bafade16cfa64e04f751e33db0ca
+	library_checksums[swift-argument-parser]=d5bad3a1da66d9f4ceb0a347a197b8fdd243a91ff6b2d72b78efb052b9d6dd33
+	library_checksums[swift-syntax]=6e016e291195eb2d60ef053bf2c726093b950d028275f358099c65da982525a9
+	library_checksums[swift-llbuild]=9aabed380281cf39da22c74309f49826257d7f661c5234d21b6059a56ce963f0
+	library_checksums[swift-corelibs-libdispatch]=c82d30b233edef0a202fbd54cbad4a5c210758e4f7191a2f47d1d59e8bf52457
+	library_checksums[swift-foundation-icu]=9ce2c4c4409bf237f42525cc137d9fe6458ec3d847f29bc5833748e154c6a89f
 	library_checksums[swift-system]=02e13a7f77887c387f5aa1de05f4d4b8b158c35145450e1d9557d6c42b06cd1f
 	library_checksums[swift-asn1]=e0da995ae53e6fcf8251887f44d4030f6600e2f8f8451d9c92fcaf52b41b6c35
+	library_checksums[swift-tools-support-core]=6604724f2bf494763d251b3b22f276911fd3c9cbb37da091d0b86e59e4e2bdc9
+	library_checksums[swift-package-manager]=906d779537139106df309ebf71a6d09d39d3743ef6716e3a35fa9fc56b92e5c6
+	library_checksums[swift-cmark]=d610dc1d1162c66c69b9f7f21a7976d3d24672167253048e400d3e34b401d3a2
+	library_checksums[indexstore-db]=221cc3498a2d5fb5077a13c857741760ab1f806eee5276d977f655e5cee5612f
 	library_checksums[swift-certificates]=fcaca458aab45ee69b0f678b72c2194b15664cc5f6f5e48d0e3f62bc5d1202ca
-	library_checksums[swift-driver]=9ee38eda1a0adc24dd995b345dff4a5a25d42ae8d063fcc04b170469f2f53d43
-	library_checksums[swift-tools-support-core]=fc83e9922d4c7df0f0d94b8840f292989eb148d5e451b182a9e390a9ea4dd94e
-	library_checksums[swift-package-manager]=03c5b8dfd8628de42ca1c171faeeddea977ecdad8675d3826a2c165ad8f972ba
-	library_checksums[indexstore-db]=fdaceb80a819e5b86d1599e7357c79e518a3ff0bb96dcd82245fc50e3d6bbc0d
-	library_checksums[sourcekit-lsp]=928db64bc179a250afd305b5729217180e2de1cdcd3d353d0fa20b38c5def8ec
+	library_checksums[swift-crypto]=5c860c0306d0393ff06268f361aaf958656e1288353a0e23c3ad20de04319154
+	library_checksums[llvm-project]=e039df72ef62f12c840ab049487c73f1f907446b1ef19558d317754d286a45ee
+	library_checksums[swift-experimental-string-processing]=0370748bef152fce4a6896e87b67014896bb1c0c4f35ce99d3b69659ce5107d5
+	library_checksums[Yams]=a81c6b93f5d26bae1b619b7f8babbfe7c8abacf95b85916961d488888df886fb
 
 	for library in "${!library_checksums[@]}"; do \
 		GH_ORG="apple"
 		if [ "$library" = "swift-argument-parser" ]; then
-			SRC_VERSION="1.2.3"
+			SRC_VERSION="1.4.0"
 			TAR_NAME=$SRC_VERSION
 		elif [ "$library" = "swift-asn1" ]; then
 			SRC_VERSION="1.0.0"
@@ -77,14 +78,18 @@ termux_step_post_get_source() {
 			SRC_VERSION="1.0.1"
 			TAR_NAME=$SRC_VERSION
 		elif [ "$library" = "swift-collections" ]; then
-			SRC_VERSION="1.1.2"
+			SRC_VERSION="1.1.3"
 			TAR_NAME=$SRC_VERSION
 		elif [ "$library" = "swift-crypto" ]; then
 			SRC_VERSION="3.0.0"
 			TAR_NAME=$SRC_VERSION
 		elif [ "$library" = "swift-system" ]; then
 			SRC_VERSION="1.3.0"
 			TAR_NAME=$SRC_VERSION
+		elif [ "$library" = "swift-toolchain-sqlite" ]; then
+			GH_ORG="swiftlang"
+			SRC_VERSION="1.0.1"
+			TAR_NAME=$SRC_VERSION
 		elif [ "$library" = "Yams" ]; then
 			GH_ORG="jpsim"
 			SRC_VERSION="5.0.6"
@@ -139,6 +144,7 @@ termux_step_make() {
 		for header in execinfo.h glob.h iconv.h spawn.h sys/sem.h sys/shm.h; do
 			ln -sf $TERMUX_PREFIX/include/$header $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include/$header
 		done
+		unset ANDROID_NDK_ROOT
 
 		SWIFT_BUILD_FLAGS="$SWIFT_BUILD_FLAGS --android
 		--android-ndk $TERMUX_STANDALONE_TOOLCHAIN --android-arch $SWIFT_ARCH
@@ -158,6 +164,7 @@ termux_step_make() {
 	--install-xctest --install-llbuild --install-swiftpm --install-swift-driver --install-sourcekit-lsp
 
 	rm $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include/{execinfo.h,glob.h,iconv.h,spawn.h,sys/sem.h,sys/shm.h}
+	rm $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/swift
 }
 
 termux_step_make_install() {

diff --git a/packages/swift/swift-arm-casts.patch b/packages/swift/swift-arm-casts.patch
@@ -11,16 +11,3 @@ index 0255b38af1b..3949e62e750 100644
    }
 
    static bool classof(const DeclAttribute *DA) {
-diff --git a/swift/lib/ExternalGenericMetadataBuilder/ExternalGenericMetadataBuilder.cpp b/swift/lib/ExternalGenericMetadataBuilder/ExternalGenericMetadataBuilder.cpp
-index 7617abe7ee7..a0016e575c7 100644
---- a/swift/lib/ExternalGenericMetadataBuilder/ExternalGenericMetadataBuilder.cpp
-+++ b/swift/lib/ExternalGenericMetadataBuilder/ExternalGenericMetadataBuilder.cpp
-@@ -1488,7 +1488,7 @@ template <typename Runtime>
- llvm::Error ExternalGenericMetadataBuilderContext<Runtime>::addImageInMemory(
-     const void *start, uint64_t length, const std::string &path) {
-   LOG(LogLevel::Info, "Adding %s in memory", path.c_str());
--  llvm::StringRef stringRef{reinterpret_cast<const char *>(start), length};
-+  llvm::StringRef stringRef{reinterpret_cast<const char *>(start), static_cast<size_t>(length)};
-   llvm::MemoryBufferRef bufferRef{stringRef, {}};
-   auto binary = llvm::object::createBinary(bufferRef);
-   if (!binary)