Skip to content

Commit 3d16b8a

Browse files
committed
Add static packages to enable -static-executable test.
1 parent 45ef3a1 commit 3d16b8a

File tree

7 files changed

+19
-2
lines changed

7 files changed

+19
-2
lines changed

nightly-main/rhel-ubi/9/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ LABEL description="Docker Container for the Swift programming language"
66
RUN yum install -y \
77
git \
88
gcc-c++ \
9+
glibc-static \
910
libcurl-devel \
1011
libedit-devel \
12+
libstdc++-devel \
13+
libstdc++-static \
1114
libuuid-devel \
1215
libxml2-devel \
1316
ncurses-devel \

swift-ci/main/amazon-linux/2023/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ RUN yum -y install \
1313
gcc-c++ \
1414
clang \
1515
git \
16+
glibc-static \
1617
libbsd-devel \
1718
libedit-devel \
1819
libicu-devel \
20+
libstdc++-static \
1921
libuuid-devel \
2022
libxml2-devel \
2123
ncurses-devel \

swift-ci/main/fedora/39/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN yum install -y \
2727
unzip \
2828
diffutils \
2929
libstdc++-devel \
30-
libstdc++-static
30+
libstdc++-static \
31+
glibc-static
3132

3233
ARG SWIFT_PLATFORM=fedora39
3334
ARG SWIFT_VERSION=5.10.1

swift-ci/main/fedora/40/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ RUN yum install -y \
2525
cmake \
2626
zip \
2727
unzip \
28-
diffutils
28+
diffutils \
29+
libstdc++-devel \
30+
libstdc++-static \
31+
glibc-static
32+
2933

3034
COPY swift-ci/dependencies/requirements.txt /dependencies/
3135
RUN pip3 install -r /dependencies/requirements.txt

swift-ci/main/fedora/41/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN yum install -y \
3030
libstdc++-static \
3131
ninja-build \
3232
gnupg \
33+
glibc-static \
3334
binutils-gold
3435

3536
ARG SWIFT_PLATFORM=fedora39

swift-ci/main/rhel-ubi/8/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ RUN yum install -y \
88
gcc-c++ \
99
clang \
1010
cmake \
11+
glibc-static \
1112
make \
1213
libcurl-devel \
1314
libedit-devel \
1415
libuuid-devel \
16+
libstdc++-devel \
17+
libstdc++-static \
1518
libxml2-devel \
1619
ncurses-devel \
1720
python3-devel \

swift-ci/main/rhel-ubi/9/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ RUN groupadd -g 42 build-user && \
66
RUN yum install -y \
77
git \
88
gcc-c++ \
9+
glibc-static \
910
cmake \
1011
diffutils \
1112
make \
1213
libcurl-devel \
1314
libedit-devel \
15+
libstdc++-devel \
16+
libstdc++-static \
1417
libuuid-devel \
1518
libxml2-devel \
1619
ncurses-devel \

0 commit comments

Comments
 (0)