about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorJoshua M. Clulow <jmc@oxide.computer>2022-03-15 13:46:02 -0700
committerJoshua M. Clulow <jmc@oxide.computer>2022-03-15 13:46:02 -0700
commit0dcb1754b6c2d2cf97aa06973875a6484be59adb (patch)
treed883b62421c87936dda0c1e167689aedd3f1e3a0 /src/ci
parent83460d5e624e9dff72ea8c8f6e79c10af10a3aa1 (diff)
solaris build environment should include libsendfile/liblgrp
As of version 0.2.120 of the libc crate, the solaris target now requires
some additional libraries to be present in the sysroot.  Note that the
solaris target doesn't really build against files from Solaris, but
rather against some files from DilOS (a platform similar to both Solaris
and illumos).  Pull in the extra libraries and their compilation links
from that apt repository.
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh20
1 files changed, 12 insertions, 8 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 4cbc2ccfe38..cf784a66ae4 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
@@ -33,14 +33,18 @@ cd solaris
 dpkg --add-architecture $APT_ARCH
 apt-get update
 apt-get download $(apt-cache depends --recurse --no-replaces \
-  libc:$APT_ARCH           \
-  libm-dev:$APT_ARCH       \
-  libpthread:$APT_ARCH     \
-  libresolv:$APT_ARCH      \
-  librt:$APT_ARCH          \
-  libsocket:$APT_ARCH      \
-  system-crt:$APT_ARCH     \
-  system-header:$APT_ARCH  \
+  libc:$APT_ARCH                                             \
+  liblgrp-dev:$APT_ARCH                                      \
+  liblgrp:$APT_ARCH                                          \
+  libm-dev:$APT_ARCH                                         \
+  libpthread:$APT_ARCH                                       \
+  libresolv:$APT_ARCH                                        \
+  librt:$APT_ARCH                                            \
+  libsendfile-dev:$APT_ARCH                                  \
+  libsendfile:$APT_ARCH                                      \
+  libsocket:$APT_ARCH                                        \
+  system-crt:$APT_ARCH                                       \
+  system-header:$APT_ARCH                                    \
   | grep "^\w")
 
 for deb in *$APT_ARCH.deb; do