Skip to content

Commit facb879

Browse files
thomasvlDavidKorczynski
thomasvl
and
DavidKorczynski
authored
Update Swift to 6.1.3 (#14486)
6.2.3 would be current, but there doesn't seem to be a download for 2004, so this keeps everything else consistent. --------- Co-authored-by: DavidKorczynski <david@adalogics.com>
1 parent be2d122 commit facb879

File tree

9 files changed

+33
-32
lines changed

9 files changed

+33
-32
lines changed

‎infra/base-images/base-builder-swift/llvmsymbol.diff‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@ diff --git a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt b/llvm/lib/DebugInfo/Sy
22
index acfb3bd0e..a499ee2e0 100644
33
--- a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
44
+++ b/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
5-
@@ -12,4 +12,11 @@ add_llvm_component_library(LLVMSymbolize
5+
@@ -12,4 +12,8 @@ add_llvm_component_library(LLVMSymbolize
66
Object
77
Support
88
Demangle
99
- )
1010
+
1111
+ LINK_LIBS
1212
+ /usr/lib/swift_static/linux/libswiftCore.a
13-
+ /usr/lib/swift_static/linux/libicui18nswift.a
14-
+ /usr/lib/swift_static/linux/libicuucswift.a
15-
+ /usr/lib/swift_static/linux/libicudataswift.a
1613
+ /usr/lib/x86_64-linux-gnu/libstdc++.so.6
1714
+)
1815
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp

‎infra/base-images/base-builder-swift/ubuntu-20-04.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-20-04
1818

19-
RUN install_swift_ubuntu_20_04.sh
19+
RUN install_swift_ubuntu-20-04.sh
2020

2121
COPY precompile_swift /usr/local/bin/

‎infra/base-images/base-builder-swift/ubuntu-24-04.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
1818

1919
COPY llvmsymbol.diff /src/
20-
RUN install_swift_ubuntu_24_04.sh
20+
RUN install_swift_ubuntu-24-04.sh
2121

2222
COPY precompile_swift /usr/local/bin/

‎infra/base-images/base-builder/install_swift.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ SWIFT_PACKAGES="wget \
3131
libz3-dev \
3232
pkg-config \
3333
tzdata \
34+
uuid-dev \
3435
zlib1g-dev"
3536
SWIFT_SYMBOLIZER_PACKAGES="build-essential make cmake ninja-build git python3 g++-multilib binutils-dev zlib1g-dev"
3637
apt-get update && apt install -y $SWIFT_PACKAGES && \
3738
apt install -y $SWIFT_SYMBOLIZER_PACKAGES --no-install-recommends
3839

3940

40-
wget -q https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
41-
tar xzf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
42-
cp -r swift-5.10.1-RELEASE-ubuntu20.04/usr/* /usr/
43-
rm -rf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz swift-5.10.1-RELEASE-ubuntu20.04/
41+
wget -q https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
42+
tar xzf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
43+
cp -r swift-6.1.3-RELEASE-ubuntu20.04/usr/* /usr/
44+
rm -rf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz swift-6.1.3-RELEASE-ubuntu20.04/
4445
# TODO: Move to a seperate work dir
4546
git clone https://github.com/llvm/llvm-project.git
4647
cd llvm-project
@@ -63,5 +64,5 @@ cd $SRC
6364
rm -rf llvm-project llvmsymbol.diff
6465

6566
# TODO: Cleanup packages
66-
apt-get remove --purge -y wget zlib1g-dev
67+
apt-get remove --purge -y wget
6768
apt-get autoremove -y

infra/base-images/base-builder/install_swift_ubuntu_20_04.sh renamed to infra/base-images/base-builder/install_swift_ubuntu-20-04.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ SWIFT_PACKAGES="wget \
3131
libz3-dev \
3232
pkg-config \
3333
tzdata \
34+
uuid-dev \
3435
zlib1g-dev"
3536
SWIFT_SYMBOLIZER_PACKAGES="build-essential make cmake ninja-build git python3 g++-multilib binutils-dev zlib1g-dev"
3637
apt-get update && apt install -y $SWIFT_PACKAGES && \
3738
apt install -y $SWIFT_SYMBOLIZER_PACKAGES --no-install-recommends
3839

3940

40-
wget -q https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
41-
tar xzf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
42-
cp -r swift-5.10.1-RELEASE-ubuntu20.04/usr/* /usr/
43-
rm -rf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz swift-5.10.1-RELEASE-ubuntu20.04/
41+
wget -q https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
42+
tar xzf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
43+
cp -r swift-6.1.3-RELEASE-ubuntu20.04/usr/* /usr/
44+
rm -rf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz swift-6.1.3-RELEASE-ubuntu20.04/
4445
# TODO: Move to a seperate work dir
4546
git clone https://github.com/llvm/llvm-project.git
4647
cd llvm-project
@@ -63,5 +64,5 @@ cd $SRC
6364
rm -rf llvm-project llvmsymbol.diff
6465

6566
# TODO: Cleanup packages
66-
apt-get remove --purge -y wget zlib1g-dev
67-
apt-get autoremove -y
67+
apt-get remove --purge -y wget
68+
apt-get autoremove -y

infra/base-images/base-builder/install_swift_ubuntu_24_04.sh renamed to infra/base-images/base-builder/install_swift_ubuntu-24-04.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,32 @@ if [[ "$VERSION_ID" == "20.04" ]]; then
3434
libz3-dev \
3535
pkg-config \
3636
tzdata \
37+
uuid-dev \
3738
zlib1g-dev"
38-
SWIFT_URL="https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu_20_04.tar.gz"
39-
SWIFT_DIR="swift-5.10.1-RELEASE-ubuntu_20_04"
39+
SWIFT_URL="https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz"
40+
SWIFT_DIR="swift-6.1.3-RELEASE-ubuntu20_04"
4041
elif [[ "$VERSION_ID" == "24.04" ]]; then
4142
SWIFT_PACKAGES="wget \
4243
binutils \
4344
git \
4445
gnupg2 \
4546
libc6-dev \
46-
libcurl4 \
47+
libcurl4-openssl-dev \
4748
libedit2 \
4849
libgcc-13-dev \
50+
libncurses-dev \
51+
libpython3-dev \
4952
libsqlite3-0 \
5053
libstdc++-13-dev \
51-
libxml2 \
54+
libxml2-dev \
5255
libz3-dev \
5356
pkg-config \
5457
tzdata \
58+
zip \
59+
unzip \
5560
zlib1g-dev"
56-
SWIFT_URL="https://download.swift.org/swift-5.10.1-release/ubuntu2404/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu24.04.tar.gz"
57-
SWIFT_DIR="swift-5.10.1-RELEASE-ubuntu24.04"
61+
SWIFT_URL="https://download.swift.org/swift-6.1.3-release/ubuntu2404/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu24.04.tar.gz"
62+
SWIFT_DIR="swift-6.1.3-RELEASE-ubuntu24.04"
5863
else
5964
echo "Unsupported Ubuntu version: $VERSION_ID"
6065
exit 1
@@ -92,5 +97,5 @@ cd $SRC
9297
rm -rf llvm-project llvmsymbol.diff
9398

9499
# TODO: Cleanup packages
95-
apt-get remove --purge -y wget zlib1g-dev
100+
apt-get remove --purge -y wget
96101
apt-get autoremove -y

‎infra/base-images/base-builder/llvmsymbol.diff‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@ diff --git a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt b/llvm/lib/DebugInfo/Sy
22
index acfb3bd0e..a499ee2e0 100644
33
--- a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
44
+++ b/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
5-
@@ -12,4 +12,11 @@ add_llvm_component_library(LLVMSymbolize
5+
@@ -12,4 +12,8 @@ add_llvm_component_library(LLVMSymbolize
66
Object
77
Support
88
Demangle
99
- )
1010
+
1111
+ LINK_LIBS
1212
+ /usr/lib/swift_static/linux/libswiftCore.a
13-
+ /usr/lib/swift_static/linux/libicui18nswift.a
14-
+ /usr/lib/swift_static/linux/libicuucswift.a
15-
+ /usr/lib/swift_static/linux/libicudataswift.a
1613
+ /usr/lib/x86_64-linux-gnu/libstdc++.so.6
1714
+)
1815
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp

‎infra/base-images/base-builder/ubuntu-20-04.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
FROM gcr.io/oss-fuzz-base/base-clang:ubuntu-20-04
1818

19-
COPY install_deps_ubuntu-20-04.sh install_swift_ubuntu_20_04.sh /
19+
COPY install_deps_ubuntu-20-04.sh install_swift_ubuntu-20-04.sh /
2020
RUN /install_deps_ubuntu-20-04.sh
2121

2222
# Build and install latest Python 3.11.
@@ -180,7 +180,7 @@ COPY bazel_build_fuzz_tests \
180180
install_python.sh \
181181
install_ruby.sh \
182182
install_rust.sh \
183-
install_swift_ubuntu_20_04.sh \
183+
install_swift_ubuntu-20-04.sh \
184184
make_build_replayable.py \
185185
python_coverage_helper.py \
186186
replay_build.sh \

‎infra/base-images/base-builder/ubuntu-24-04.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
FROM gcr.io/oss-fuzz-base/base-clang:ubuntu-24-04
1818

19-
COPY install_deps_ubuntu-24-04.sh install_swift_ubuntu_24_04.sh /
19+
COPY install_deps_ubuntu-24-04.sh install_swift_ubuntu-24-04.sh /
2020
RUN /install_deps_ubuntu-24-04.sh
2121

2222
# Build and install latest Python 3.11.
@@ -180,7 +180,7 @@ COPY bazel_build_fuzz_tests \
180180
install_python.sh \
181181
install_ruby.sh \
182182
install_rust.sh \
183-
install_swift_ubuntu_24_04.sh \
183+
install_swift_ubuntu-24-04.sh \
184184
make_build_replayable.py \
185185
python_coverage_helper.py \
186186
replay_build.sh \

0 commit comments

Comments
 (0)