Skip to content

Commit 4d4d8b6

Browse files
colemancdacolemancda
authored
Merge pull request #10 from MillerTechnologyPeru/feature/6.0.2
Update to Swift 6.0.2
2 parents 7fd58cd + 0c60340 commit 4d4d8b6

File tree

15 files changed

+54
-87
lines changed

15 files changed

+54
-87
lines changed

‎.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# [Choice] Swift version: 5.6-focal, 5.5, 5.4, 5.3, 5.2, 5.1, 4.2
2-
ARG VARIANT=5.10-jammy
2+
ARG VARIANT=6.0.2-jammy
33
FROM swift:${VARIANT}
44

55
# [Option] Install zsh

‎.devcontainer/devcontainer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dockerfile": "Dockerfile",
77
"args": {
88
// Update the VARIANT arg to pick a Swift version
9-
"VARIANT": "5.10-jammy",
9+
"VARIANT": "6.0.2-jammy",
1010
// Options
1111
"NODE_VERSION": "lts/*"
1212
}
@@ -28,7 +28,9 @@
2828

2929
// Add the IDs of extensions you want installed when the container is created.
3030
"extensions": [
31-
"sswg.swift-lang"
31+
"sswg.swift-lang",
32+
"ms-vscode.cmake-tools",
33+
"ms-vscode.makefile-tools"
3234
]
3335
}
3436
},

‎.github/workflows/buildroot-experimental.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
config: ["nezha"]
10-
runs-on: ubuntu-latest
11-
container: swift:5.10-jammy
10+
runs-on: Linux
11+
container: swift:6.0.2-jammy
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3
@@ -22,7 +22,7 @@ jobs:
2222
export BUILDROOT_RELEASE=2024.02.9
2323
export DEBIAN_FRONTEND=noninteractive
2424
export DEBCONF_NONINTERACTIVE_SEEN=true
25-
export SWIFT_BIN_URL=https://github.com/MillerTechnologyPeru/swift/releases/download/swift-5.10-RELEASE/swift-5.10-Debian11-x86_64.tar.gz
25+
export SWIFT_BIN_URL=https://github.com/MillerTechnologyPeru/swift/releases/download/swift-6.0.2-RELEASE/swift-6.0.2-Debian11-x86_64.tar.gz
2626
apt update
2727
$SRC_ROOT/.devcontainer/library-scripts/install-dependencies.sh
2828
$SRC_ROOT/.devcontainer/library-scripts/install-swift.sh
@@ -41,7 +41,7 @@ jobs:
4141
matrix:
4242
config: ["qemu_ppc_mac99"]
4343
runs-on: ubuntu-latest
44-
container: swift:5.10-jammy
44+
container: swift:6.0.2-jammy
4545
steps:
4646
- name: Checkout
4747
uses: actions/checkout@v3
@@ -55,7 +55,7 @@ jobs:
5555
export BUILDROOT_RELEASE=2024.02.9
5656
export DEBIAN_FRONTEND=noninteractive
5757
export DEBCONF_NONINTERACTIVE_SEEN=true
58-
export SWIFT_BIN_URL=https://github.com/MillerTechnologyPeru/swift/releases/download/swift-5.10-RELEASE/swift-5.10-Debian11-x86_64.tar.gz
58+
export SWIFT_BIN_URL=https://github.com/MillerTechnologyPeru/swift/releases/download/swift-6.0.2-RELEASE/swift-6.0.2-Debian11-x86_64.tar.gz
5959
apt update
6060
$SRC_ROOT/.devcontainer/library-scripts/install-dependencies.sh
6161
$SRC_ROOT/.devcontainer/library-scripts/install-swift.sh
@@ -74,7 +74,7 @@ jobs:
7474
matrix:
7575
config: ["qemu_mips32r6el_malta", "qemu_mips64r6el_malta"]
7676
runs-on: ubuntu-latest
77-
container: swift:5.10-jammy
77+
container: swift:6.0.2-jammy
7878
steps:
7979
- name: Checkout
8080
uses: actions/checkout@v3
@@ -88,7 +88,7 @@ jobs:
8888
export BUILDROOT_RELEASE=2024.02.9
8989
export DEBIAN_FRONTEND=noninteractive
9090
export DEBCONF_NONINTERACTIVE_SEEN=true
91-
export SWIFT_BIN_URL=https://github.com/MillerTechnologyPeru/swift/releases/download/swift-5.10-RELEASE/swift-5.10-Debian11-x86_64.tar.gz
91+
export SWIFT_BIN_URL=https://github.com/MillerTechnologyPeru/swift/releases/download/swift-6.0.2-RELEASE/swift-6.0.2-Debian11-x86_64.tar.gz
9292
apt update
9393
$SRC_ROOT/.devcontainer/library-scripts/install-dependencies.sh
9494
$SRC_ROOT/.devcontainer/library-scripts/install-swift.sh

‎.github/workflows/buildroot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
strategy:
77
matrix:
88
config: ["imx6slevk", "aarch64_efi", "pc_x86_64_efi", "qemu_x86", "olimex_imx233_olinuxino", "raspberrypi0w", "qemu_ppc64le_pseries"]
9-
runs-on: ubuntu-latest
10-
container: swift:5.10-jammy
9+
runs-on: Linux
10+
container: swift:6.0.2-jammy
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3

‎package/foundation/001-Foundation-strlcpy.patch

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

‎package/foundation/foundation.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256 e25700bffc439b36c5c9acf169332c0dd9805fcd91cd570b4ce96163b70bae5b foundation-5.10.tar.gz
1+
sha256 8af719f14a05cee2d32625cf455261fc74d13eeef3ba9e5b9547316743d5cde9 foundation-6.0.2.tar.gz

‎package/foundation/foundation.mk

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Foundation
2-
FOUNDATION_VERSION = 5.10
3-
FOUNDATION_SITE = $(call github,apple,swift-corelibs-foundation,swift-$(FOUNDATION_VERSION)-RELEASE)
2+
FOUNDATION_VERSION = 6.0.2
3+
FOUNDATION_SITE = $(call github,swiftlang,swift-corelibs-foundation,swift-$(FOUNDATION_VERSION)-RELEASE)
44
FOUNDATION_LICENSE = Apache-2.0
55
FOUNDATION_LICENSE_FILES = LICENSE
66
FOUNDATION_INSTALL_STAGING = YES
@@ -13,19 +13,15 @@ FOUNDATION_CONF_OPTS += \
1313
-DCMAKE_Swift_FLAGS_DEBUG="" \
1414
-DCMAKE_Swift_FLAGS_RELEASE="" \
1515
-DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \
16-
-DCF_DEPLOYMENT_SWIFT=ON \
1716
-Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \
18-
-DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \
19-
-DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \
20-
-DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \
21-
-DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \
22-
-DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \
23-
-DICU_DATA_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicudata.so \
2417
-DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \
2518
-DCURL_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libcurl.so \
2619
-DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \
2720
-DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \
2821
-DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \
22+
-DLibRT_LIBRARIES=${STAGING_DIR}/usr/lib/librt.a \
23+
-DSwiftFoundation_MODULE_TRIPLE=${SWIFT_TARGET_NAME} \
24+
-DSwiftFoundation_MACRO=${SWIFT_NATIVE_PATH}/../lib/swift/host/plugins \
2925

3026
ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES)
3127
FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)
@@ -51,6 +47,9 @@ define FOUNDATION_CONFIGURE_CMDS
5147
-DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \
5248
-DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \
5349
-DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \
50+
-DCMAKE_CXX_COMPILER=$(SWIFT_NATIVE_PATH)/clang++ \
51+
-DCMAKE_CXX_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot $(STAGING_DIR) -latomic $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(STAGING_DIR)/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME)" \
52+
-DCMAKE_CXX_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \
5453
-DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \
5554
$(FOUNDATION_CONF_OPTS) \
5655
)
@@ -70,17 +69,9 @@ define FOUNDATION_INSTALL_STAGING_CMDS
7069
cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/
7170
# Copy CoreFoundation module
7271
mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation
73-
cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/
72+
cp $(FOUNDATION_SRCDIR)/Sources/CoreFoundation/include/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/
7473
touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map
7574
echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map
76-
# Copy CFXMLInterface module
77-
mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface
78-
touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map
79-
echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map
80-
# Copy CFURLSessionInterface module
81-
mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface
82-
touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map
83-
echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map
8475
# Copy Swift modules
8576
cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/
8677
# Restore Dispatch headers

‎package/libdispatch/libdispatch.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256 16e088cf12654d22658879710b9694a6fad1c94d5e5d0c597741b71fbcb3e034 libdispatch-5.10.tar.gz
1+
sha256 3df429b22d9294c0ca5291c86e83a35f6326600a1c271933107bba199b919008 libdispatch-6.0.2.tar.gz

‎package/libdispatch/libdispatch.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Grand Central Dispatch
2-
LIBDISPATCH_VERSION = 5.10
3-
LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE)
2+
LIBDISPATCH_VERSION = 6.0.2
3+
LIBDISPATCH_SITE = $(call github,swiftlang,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE)
44
LIBDISPATCH_LICENSE = Apache-2.0
55
LIBDISPATCH_LICENSE_FILES = LICENSE
66
LIBDISPATCH_INSTALL_STAGING = YES

‎package/libswiftdispatch/libswiftdispatch.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256 16e088cf12654d22658879710b9694a6fad1c94d5e5d0c597741b71fbcb3e034 libswiftdispatch-5.10.tar.gz
1+
sha256 3df429b22d9294c0ca5291c86e83a35f6326600a1c271933107bba199b919008 libswiftdispatch-6.0.2.tar.gz

‎package/libswiftdispatch/libswiftdispatch.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Grand Central Dispatch with Swift overlay
2-
LIBSWIFTDISPATCH_VERSION = 5.10
3-
LIBSWIFTDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBSWIFTDISPATCH_VERSION)-RELEASE)
2+
LIBSWIFTDISPATCH_VERSION = 6.0.2
3+
LIBSWIFTDISPATCH_SITE = $(call github,swiftlang,swift-corelibs-libdispatch,swift-$(LIBSWIFTDISPATCH_VERSION)-RELEASE)
44
LIBSWIFTDISPATCH_LICENSE = Apache-2.0
55
LIBSWIFTDISPATCH_LICENSE_FILES = LICENSE
66
LIBSWIFTDISPATCH_INSTALL_STAGING = YES

‎package/swift/swift.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256 874c3b6668fb138db35c9f1c63570dafacac8476a6094b17764a51a45a1b69a2 swift-5.10.tar.gz
1+
sha256 1489681860e92cee5ddd869a06531d7a1746b2f4ea105a2ff3b631ebcbcffd34 swift-6.0.2.tar.gz

‎package/swift/swift.mk

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Apple's Swift Programming Language
2-
SWIFT_VERSION = 5.10
3-
SWIFT_SITE = $(call github,apple,swift,swift-$(SWIFT_VERSION)-RELEASE)
2+
SWIFT_VERSION = 6.0.2
3+
SWIFT_SITE = $(call github,swiftlang,swift,swift-$(SWIFT_VERSION)-RELEASE)
44
SWIFT_LICENSE = Apache-2.0
55
SWIFT_LICENSE_FILES = LICENSE.txt
66
SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH))
@@ -65,6 +65,8 @@ $(SWIFTC_EXTRA_FLAGS) \
6565
-sdk ${STAGING_DIR} \
6666
"
6767

68+
SWIFT_STRING_PROCESSING_SRCDIR=$(SWIFT_BUILDDIR)/swift-experimental-string-processing-swift-$(SWIFT_VERSION)-RELEASE
69+
6870
SWIFT_CONF_OPTS = \
6971
-DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \
7072
-DCMAKE_CXX_COMPILER=$(SWIFT_NATIVE_PATH)/clang++ \
@@ -85,23 +87,27 @@ SWIFT_CONF_OPTS = \
8587
-DSWIFT_BUILD_REMOTE_MIRROR=OFF \
8688
-DSWIFT_BUILD_SOURCEKIT=OFF \
8789
-DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=OFF \
88-
-DSWIFT_BUILD_SYNTAXPARSERLIB=OFF \
8990
-DSWIFT_ENABLE_SOURCEKIT_TESTS=OFF \
9091
-DSWIFT_INCLUDE_DOCS=OFF \
9192
-DSWIFT_INCLUDE_TOOLS=OFF \
92-
-DSWIFT_INCLUDE_TESTS=OFF \
9393
-DSWIFT_HOST_VARIANT_ARCH=${SWIFT_TARGET_ARCH} \
9494
-DSWIFT_SDKS=LINUX \
9595
-DSWIFT_SDK_LINUX_ARCH_${SWIFT_TARGET_ARCH}_PATH=${STAGING_DIR} \
96-
-DSWIFT_SDK_LINUX_ARCH_${SWIFT_TARGET_ARCH}_LIBC_INCLUDE_DIRECTORY=${STAGING_DIR}/usr/include \
9796
-DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SRCDIR} \
9897
-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON \
98+
-DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=ON \
99+
-DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=${SWIFT_STRING_PROCESSING_SRCDIR} \
99100
-DSWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP=OFF \
100101
-DSWIFT_ENABLE_CXX_INTEROP_SWIFT_BRIDGING_HEADER=OFF \
101102
-DSWIFT_BUILD_STDLIB_CXX_MODULE=OFF \
103+
-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON \
104+
-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON \
105+
-DSWIFT_ENABLE_EXPERIMENTAL_NONESCAPABLE_TYPES=ON \
106+
-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=ON \
107+
-DSWIFT_ENABLE_SYNCHRONIZATION=ON \
102108
-DSWIFT_INCLUDE_TESTS=OFF \
103109
-DSWIFT_INCLUDE_TEST_BINARIES=OFF \
104-
-DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF \
110+
-DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF \
105111
-DZLIB_LIBRARY=$(STAGING_DIR)/usr/lib/libz.so \
106112

107113
ifeq ($(SWIFT_TARGET_ARCH),armv7)
@@ -150,6 +156,13 @@ else
150156
endif
151157

152158
define SWIFT_CONFIGURE_CMDS
159+
# Fetch Swift string processing sources
160+
(mkdir -p $(SWIFT_BUILDDIR) && \
161+
cd $(SWIFT_BUILDDIR) && \
162+
wget https://github.com/swiftlang/swift-experimental-string-processing/archive/refs/tags/swift-${SWIFT_VERSION}-RELEASE.tar.gz && \
163+
tar -xvf swift-${SWIFT_VERSION}-RELEASE.tar.gz && \
164+
rm -rf swift-${SWIFT_VERSION}-RELEASE.tar.gz \
165+
)
153166
# Configure for Ninja
154167
(mkdir -p $(SWIFT_BUILDDIR) && \
155168
cd $(SWIFT_BUILDDIR) && \
@@ -183,7 +196,7 @@ define SWIFT_INSTALL_STAGING_CMDS
183196
rm $(SWIFT_BUILDDIR)/lib/swift/linux/libstdcxx.modulemap
184197
endef
185198

186-
HOST_SWIFT_SUPPORT_DIR=$(HOST_DIR)/usr/share/swift
199+
HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift
187200
SWIFT_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/toolchain.json
188201

189202
define HOST_SWIFT_INSTALL_CMDS

‎package/xctest/xctest.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256 b298316185270ac43ecdaf4c2fbd4329af51a18b174650510d7526238e9ca6fa xctest-5.10.tar.gz
1+
sha256 b298316185270ac43ecdaf4c2fbd4329af51a18b174650510d7526238e9ca6fa xctest-6.0.2.tar.gz

‎package/xctest/xctest.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### XCTest
2-
XCTEST_VERSION = 5.10
3-
XCTEST_SITE = $(call github,apple,swift-corelibs-xctest,swift-$(XCTEST_VERSION)-RELEASE)
2+
XCTEST_VERSION = 6.0.2
3+
XCTEST_SITE = $(call github,swiftlang,swift-corelibs-xctest,swift-$(XCTEST_VERSION)-RELEASE)
44
XCTEST_LICENSE = Apache-2.0
55
XCTEST_LICENSE_FILES = LICENSE
66
XCTEST_INSTALL_STAGING = YES

0 commit comments

Comments
 (0)