diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2021-01-20 23:29:55 +0100 |
|---|---|---|
| committer | Mara Bos <m-ou.se@m-ou.se> | 2021-01-20 23:29:55 +0100 |
| commit | 49b3d9c22a51fe9bdeb5cc7c5dcccdeeadf6763c (patch) | |
| tree | 712901e2de5f28943cda3a1f749816bb5d5ff625 | |
| parent | a4cbb44ae2c80545db957763b502dc7f6ea22085 (diff) | |
| download | rust-49b3d9c22a51fe9bdeb5cc7c5dcccdeeadf6763c.tar.gz rust-49b3d9c22a51fe9bdeb5cc7c5dcccdeeadf6763c.zip | |
Work around missing -dev packages in solaris docker image.
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh b/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh index 4b3f284450e..6c4aa875269 100755 --- a/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh +++ b/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh @@ -30,12 +30,12 @@ cd solaris dpkg --add-architecture $APT_ARCH apt-get update apt-get download $(apt-cache depends --recurse --no-replaces \ - libc-dev:$APT_ARCH \ + libc:$APT_ARCH \ libm-dev:$APT_ARCH \ - libpthread-dev:$APT_ARCH \ - libresolv-dev:$APT_ARCH \ - librt-dev:$APT_ARCH \ - libsocket-dev:$APT_ARCH \ + libpthread:$APT_ARCH \ + libresolv:$APT_ARCH \ + librt:$APT_ARCH \ + libsocket:$APT_ARCH \ system-crt:$APT_ARCH \ system-header:$APT_ARCH \ | grep "^\w") @@ -44,6 +44,14 @@ for deb in *$APT_ARCH.deb; do dpkg -x $deb . done +# The -dev packages are not available from the apt repository we're using. +# However, those packages are just symlinks from *.so to *.so.<version>. +# This makes all those symlinks. +for lib in $(find -name '*.so.*'); do + target=${lib%.so.*}.so + [ -e $target ] || ln -s ${lib##*/} $target +done + # Remove Solaris 11 functions that are optionally used by libbacktrace. # This is for Solaris 10 compatibility. rm usr/include/link.h |
