swift-native: update for 6.1.2 and Scarthgap

Update the native Swift toolchain for Swift 6.1.2 and Scarthgap.

Author: lhoward

recipes-devtools/swift/swift-native.bb

@@ -1,51 +1,58 @@
-SUMMARY = "Swift toolchain for Linux"
-HOMEPAGE = "https://swift.org/download/#releases"
+SUMMARY = "Swift native toolchain for Linux"
+HOMEPAGE = "https://swift.org/install/"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/usr/share/swift/LICENSE.txt;md5=f6c482a0548ea60d6c2e015776534035"
 
 require swift-version.inc
 PV = "${SWIFT_VERSION}"
 
-SRC_DIR = "swift-${PV}-RELEASE-ubuntu20.04"
-SRC_URI = "https://download.swift.org/swift-${PV}-release/ubuntu2004/swift-${PV}-RELEASE/swift-${PV}-RELEASE-ubuntu20.04.tar.gz"
-SRC_URI[sha256sum] = "b014975844beac5ab3a7f71420181f45d0a93243f9ea4853e6588c05cad1e363"
+def swift_native_arch_suffix(d):
+    host_arch = d.getVar('HOST_ARCH')
+    if host_arch == 'x86_64':
+        return ''
+    else:
+        return f'-{host_arch}'
+
+def swift_native_arch_checksum(d):
+    sha256 = {
+      "x86_64": "d749d5fe2d6709ee988e96b16f02bca7b53304d09925e31063fd5ec56019de9f",
+      "aarch64": "0be937ec11860cad109ab422541643f7c6b1156daa91c9e2c70d8f03ce245cb6"
+    }
+
+    host_arch = d.getVar('HOST_ARCH')
+    return sha256[host_arch]
+
+SWIFT_ARCH_SUFFIX = "${@swift_native_arch_suffix(d)}"
+
+SRC_DIR = "swift-${SWIFT_VERSION}-RELEASE-ubuntu24.04${SWIFT_ARCH_SUFFIX}"
+SRC_URI = "https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2404${SWIFT_ARCH_SUFFIX}/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu24.04${SWIFT_ARCH_SUFFIX}.tar.gz"
+SRC_URI[sha256sum] = "${@swift_native_arch_checksum(d)}"
 
 DEPENDS = "curl"
-RDEPENDS = "ncurses-native"
- 
+RDEPENDS:${PN} = "ncurses-native"
+
 S = "${WORKDIR}/${SRC_DIR}"
 
 inherit native
 
 ########################################################################
 # This informs bitbake that we want to install a non-default directory #
 # in the native sysroot.                                               #
-#                                                                      #
-# We install the swift toolchain into opt to avoid conflicts with      #
-# other packages when installing. Ex:                                  #
-#                                                                      #
-#   The file /usr/include/unicode/sortkey.h is installed by both       #
-#   swift-native and icu-native, aborting                              #
-#                                                                      #
 ########################################################################
-SYSROOT_DIRS_NATIVE += "${base_prefix}/opt"
-
-do_install_append () {
-    install -d ${D}${base_prefix}/opt/usr/bin/
-    cp -r ${S}/usr/bin/* ${D}${base_prefix}/opt/usr/bin/
 
-    install -d ${D}${bindir}/
-    ln -s ../../opt/usr/bin ${D}${bindir}/swift-tools
+do_install:append () {
+    install -d ${D}${bindir}
+    cp -r ${S}/usr/bin/* ${D}${bindir}
 
-    install -d ${D}${base_prefix}/opt/usr/lib/
-    cp -r ${S}/usr/lib/* ${D}${base_prefix}/opt/usr/lib/
+    install -d ${D}${libdir}
+    cp -rd ${S}/usr/lib/* ${D}${libdir}
 
-    install -d ${D}${base_prefix}/opt/usr/include/
-    cp -r ${S}/usr/include/* ${D}${base_prefix}/opt/usr/include/
+    install -d ${D}${includedir}
+    cp -rd ${S}/usr/include/* ${D}${includedir}
 
-    install -d ${D}${base_prefix}/opt/usr/share/
-    cp -r ${S}/usr/share/* ${D}${base_prefix}/opt/usr/share/
+    install -d ${D}${datadir}
+    cp -rd ${S}/usr/share/* ${D}${datadir}
 }
 
-FILES_${PN} += "${base_prefix}/opt/*"
+FILES:${PN} += "${base_prefix}/*"