Skip to content

Commit fbfa687

Browse files
lhowardlhoward
committed
upgrade to Swift 6.3
1 parent fc3f23e commit fbfa687

14 files changed

Lines changed: 81 additions & 197 deletions

‎classes/swift-cmake-base.bbclass‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ SWIFT_FLAGS = "-target ${SWIFT_TARGET_NAME} -use-ld=lld \
8383
${SWIFT_EXTRA_SWIFTC_CC_FLAGS} \
8484
-I${STAGING_DIR_NATIVE}/usr/lib/${TARGET_SYS}/gcc/${TARGET_SYS}/${SWIFT_GCC_VERSION}/include \
8585
-I${STAGING_DIR_NATIVE}/usr/lib/${TARGET_SYS}/gcc/${TARGET_SYS}/${SWIFT_GCC_VERSION}/include-fixed \
86-
-I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include \
87-
-I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include-fixed \
86+
-I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include \
87+
-I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include-fixed \
8888
-Xcc -I${STAGING_DIR_NATIVE}/usr/lib/${TARGET_SYS}/gcc/${TARGET_SYS}/${SWIFT_GCC_VERSION}/include \
8989
-Xcc -I${STAGING_DIR_NATIVE}/usr/lib/${TARGET_SYS}/gcc/${TARGET_SYS}/${SWIFT_GCC_VERSION}/include-fixed \
90-
-Xcc -I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include \
91-
-Xcc -I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include-fixed \
90+
-Xcc -I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include \
91+
-Xcc -I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include-fixed \
9292
-L${STAGING_DIR_TARGET} \
9393
-L${STAGING_DIR_TARGET}/lib \
9494
-L${STAGING_DIR_TARGET}/usr/lib \

‎classes/swift-common.bbclass‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ python () {
1919
d.setVar("SWIFT_GCC_VERSION", gcc_ver)
2020
}
2121

22+
SWIFT_CLANG_VERSION = "21"
23+
2224
SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', '${TARGET_ARCH}-unknown-linux-gnu', d)}"
2325
SWIFT_TARGET_ARCH = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7', '${TARGET_ARCH}', d)}"
2426
TARGET_CPU_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-a', '${TARGET_ARCH}', d)}"

‎classes/swift.bbclass‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ python swift_do_configure() {
132132
"-I${STAGING_INCDIR}",
133133
"-I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GCC_VERSION}",
134134
"-I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GCC_VERSION}/${TARGET_SYS}",
135-
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include",
136-
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include-fixed"
135+
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include",
136+
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include-fixed"
137137
],
138138
"extra-swiftc-flags":[
139139
"-target", "${SWIFT_TARGET_NAME}",
@@ -148,8 +148,8 @@ python swift_do_configure() {
148148
"-I${STAGING_INCDIR}",
149149
"-I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GCC_VERSION}",
150150
"-I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GCC_VERSION}/${TARGET_SYS}",
151-
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include",
152-
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/17/include-fixed",
151+
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include",
152+
"-I${STAGING_DIR_NATIVE}/usr/lib/clang/${SWIFT_CLANG_VERSION}/include-fixed",
153153
154154
"-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",
155155

‎recipes-devtools/swift/libdispatch.bb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ TARGET_LDFLAGS += "-L${STAGING_DIR_TARGET}/usr/lib/swift/linux"
2121

2222
# Enable Swift parts
2323
EXTRA_OECMAKE += "-DENABLE_SWIFT=YES"
24+
EXTRA_OECMAKE += "-Ddispatch_MODULE_TRIPLE=${SWIFT_TARGET_NAME}"
2425

2526
# Ensure the right CPU is targeted
2627
cmake_do_generate_toolchain_file:append() {
@@ -49,6 +50,7 @@ FILES:${PN} = "\
4950
FILES:${PN}-dev = "\
5051
${libdir}/swift/linux/${SWIFT_TARGET_ARCH}/Dispatch.swiftdoc \
5152
${libdir}/swift/linux/${SWIFT_TARGET_ARCH}/Dispatch.swiftmodule \
53+
${libdir}/swift/linux/Dispatch.swiftmodule \
5254
${includedir}/Block \
5355
${includedir}/os \
5456
${includedir}/dispatch \

‎recipes-devtools/swift/swift-foundation-essentials.bb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRCREV_FORMAT = "foundation_icu_syntax_collections"
1212
SRC_URI = "git://github.com/swiftlang/swift-foundation.git;protocol=https;name=foundation;tag=${SWIFT_TAG};nobranch=1;"
1313
SRC_URI += "git://github.com/swiftlang/swift-foundation-icu.git;protocol=https;name=icu;tag=${SWIFT_TAG};nobranch=1;destsuffix=swift-foundation-icu;"
1414
SRC_URI += "git://github.com/swiftlang/swift-syntax.git;protocol=https;name=syntax;tag=${SWIFT_TAG};nobranch=1;destsuffix=swift-foundation-icu;"
15-
SRC_URI += "git://github.com/apple/swift-collections.git;protocol=https;nobranch=1;name=collections;tag=1.1.4;destsuffix=swift-collections;"
15+
SRC_URI += "git://github.com/apple/swift-collections.git;protocol=https;nobranch=1;name=collections;tag=1.1.6;destsuffix=swift-collections;"
1616
SRC_URI += "file://0001-build-with-64-bit-fsblkcnt_t-on-32-bit-glibc-platfor.patch;striplevel=1;"
1717
SRC_URI += "file://0002-build-with-64-bit-time_t-on-32-bit-platforms.patch;striplevel=1;"
1818

@@ -31,6 +31,7 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=YES"
3131
EXTRA_OECMAKE += "-D_SwiftFoundationICU_SourceDIR=${UNPACKDIR}/swift-foundation-icu"
3232
EXTRA_OECMAKE += "-D_SwiftCollections_SourceDIR=${UNPACKDIR}/swift-collections"
3333
EXTRA_OECMAKE += "-DSwiftFoundation_MODULE_TRIPLE=${SWIFT_TARGET_NAME}"
34+
EXTRA_OECMAKE += "-DSwiftCollections_MODULE_TRIPLE=${SWIFT_TARGET_NAME}"
3435
EXTRA_OECMAKE += "-DSwiftSyntax_DIR=${UNPACKDIR}/swift-syntax/cmake/modules"
3536

3637
# Ensure the right CPU is targeted

‎recipes-devtools/swift/swift-native.bb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def swift_host_arch(d):
1919

2020
def swift_native_arch_checksum(d):
2121
sha256 = {
22-
"x86_64": "969b1241a3fd9aa446cb47c1b2e4a7c72a54df9d48ec6f65aed09549095a71f5",
23-
"aarch64": "41fa73da20451831b29ddd989d0828f31f7b7e51633cf59249566f356e2b0ca1"
22+
"x86_64": "6b3558cb78f7b176fd586223aad62a4703cb82f9d5aee94c5d4a41e58d8bf4a1",
23+
"aarch64": "b88b65fac38228e57f3bd73d74b543e9d0f6990443d75491e1cb2c1533d3c0e5"
2424
}
2525

2626
host_arch = d.getVar('HOST_ARCH')

‎recipes-devtools/swift/swift-stdlib.bb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ SRC_URI = "\
1717
git://github.com/swiftlang/swift-corelibs-libdispatch.git;protocol=https;name=libdispatch;tag=${SWIFT_TAG};nobranch=1;destsuffix=libdispatch; \
1818
git://github.com/swiftlang/swift-experimental-string-processing.git;protocol=https;name=stringproc;tag=${SWIFT_TAG};nobranch=1;destsuffix=swift-experimental-string-processing; \
1919
git://github.com/swiftlang/swift-syntax.git;protocol=https;name=syntax;tag=${SWIFT_TAG};nobranch=1;destsuffix=swift-syntax; \
20-
file://0001-add-arm-to-float16support-for-armv7.patch;striplevel=1; \
21-
file://0002-build-with-64-bit-time_t-on-32-bit-platforms.patch;striplevel=1; \
2220
file://0003-add-fix-for-metadataaccessor-abi-mismatch.patch;striplevel=1; \
2321
"
2422

@@ -76,7 +74,6 @@ do_configure() {
7674
mkdir -p ${SWIFT_BUILDDIR}
7775

7876
cat <<EOF > ${SWIFT_CMAKE_TOOLCHAIN_FILE}
79-
set(CMAKE_INSTALL_PREFIX /usr)
8077
set(CMAKE_COLOR_MAKEFILE OFF)
8178
set(CMAKE_CROSSCOMPILING ON)
8279
set(CMAKE_BUILD_TYPE Release)

‎recipes-devtools/swift/swift-stdlib/0001-add-arm-to-float16support-for-armv7.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎recipes-devtools/swift/swift-stdlib/0002-build-with-64-bit-time_t-on-32-bit-platforms.patch‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎recipes-devtools/swift/swift-testing.bb‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ EXTRA_OESWIFT = "-Xswiftc -enable-testing"
1515

1616
SRC_URI = "git://github.com/swiftlang/swift-testing.git;protocol=https;tag=${SWIFT_TAG};nobranch=1"
1717
SRC_URI += "file://0001-build-as-dynamic-library.patch;striplevel=1;"
18-
SRC_URI += "file://0002-order-limits.h-before-stdlib.h-to-workaround-for-gli.patch;striplevel=1;"
1918

2019
S = "${UNPACKDIR}/git"
2120
B = "${WORKDIR}/build"
@@ -26,15 +25,21 @@ do_install() {
2625
install -d ${D}${libdir}/swift/linux
2726

2827
install -m 0644 ${BUILD_DIR}/libTesting.so ${D}${libdir}/swift/linux
29-
install -m 0644 ${BUILD_DIR}/Modules/Testing.swiftmodule ${D}${libdir}/swift/linux
30-
install -m 0644 ${BUILD_DIR}/Modules/Testing.swiftdoc ${D}${libdir}/swift/linux
31-
install -m 0644 ${BUILD_DIR}/Modules/Testing.swiftinterface ${D}${libdir}/swift/linux
28+
install -m 0644 ${BUILD_DIR}/lib_TestingInterop.so ${D}${libdir}/swift/linux
29+
cp -r ${BUILD_DIR}/Modules/Testing.swiftmodule ${D}${libdir}/swift/linux/
30+
if [ -f ${BUILD_DIR}/Modules/Testing.swiftdoc ]; then
31+
install -m 0644 ${BUILD_DIR}/Modules/Testing.swiftdoc ${D}${libdir}/swift/linux
32+
fi
33+
if [ -f ${BUILD_DIR}/Modules/Testing.swiftinterface ]; then
34+
install -m 0644 ${BUILD_DIR}/Modules/Testing.swiftinterface ${D}${libdir}/swift/linux
35+
fi
3236

3337
rm -f ${BUILD_DIR}/Modules/*.swiftsourceinfo
3438
}
3539

3640
FILES:${PN} = "\
3741
${libdir}/swift/linux/libTesting.so \
42+
${libdir}/swift/linux/lib_TestingInterop.so \
3843
"
3944

4045
FILES:${PN}-dev = "\

0 commit comments

Comments
 (0)