Skip to content

Commit 3aa3252

Browse files
committed
Auto merge of #81229 - m-ou-se:solaris-workaround, r=pietroalbini
Work around missing -dev packages in solaris docker image. This should hopefully make the `dist-various-2` docker build work again on CI, which is now blocking everything from getting merged. r? `@pietroalbini`
2 parents a4cbb44 + 49b3d9c commit 3aa3252

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh

+13-5
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ cd solaris
3030
dpkg --add-architecture $APT_ARCH
3131
apt-get update
3232
apt-get download $(apt-cache depends --recurse --no-replaces \
33-
libc-dev:$APT_ARCH \
33+
libc:$APT_ARCH \
3434
libm-dev:$APT_ARCH \
35-
libpthread-dev:$APT_ARCH \
36-
libresolv-dev:$APT_ARCH \
37-
librt-dev:$APT_ARCH \
38-
libsocket-dev:$APT_ARCH \
35+
libpthread:$APT_ARCH \
36+
libresolv:$APT_ARCH \
37+
librt:$APT_ARCH \
38+
libsocket:$APT_ARCH \
3939
system-crt:$APT_ARCH \
4040
system-header:$APT_ARCH \
4141
| grep "^\w")
@@ -44,6 +44,14 @@ for deb in *$APT_ARCH.deb; do
4444
dpkg -x $deb .
4545
done
4646

47+
# The -dev packages are not available from the apt repository we're using.
48+
# However, those packages are just symlinks from *.so to *.so.<version>.
49+
# This makes all those symlinks.
50+
for lib in $(find -name '*.so.*'); do
51+
target=${lib%.so.*}.so
52+
[ -e $target ] || ln -s ${lib##*/} $target
53+
done
54+
4755
# Remove Solaris 11 functions that are optionally used by libbacktrace.
4856
# This is for Solaris 10 compatibility.
4957
rm usr/include/link.h

0 commit comments

Comments
 (0)