Copy to both /lib32 (for ld.so) and /usr/lib/i386-linux-gnu/ (for cma…

…ke find_package)
DynamoRIO · Jan 13, 2024 · c0d8e9a · c0d8e9a
1 parent 2cbf3d8
commit c0d8e9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/.github/workflows/ci-clang.yml b/.github/workflows/ci-clang.yml
@@ -70,6 +70,10 @@ jobs:
           zlib1g:i386 zlib1g-dev:i386
         mkdir ../extract
         for i in *.deb; do dpkg-deb -x $i ../extract; done
+        # find_package(ZLIB) doesn't find /lib32, yet ld.so seems to need lib32,
+        # so we do both:
+        sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
+        sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
         sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /lib32/
         sudo rsync -av ../extract/lib/i386-linux-gnu/ /lib32/
         sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/

diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml
@@ -69,6 +69,10 @@ jobs:
           zlib1g:i386 zlib1g-dev:i386
         mkdir ../extract
         for i in *.deb; do dpkg-deb -x $i ../extract; done
+        # find_package(ZLIB) doesn't find /lib32, yet ld.so seems to need lib32,
+        # so we do both:
+        sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
+        sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
         sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /lib32/
         sudo rsync -av ../extract/lib/i386-linux-gnu/ /lib32/
         sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/

diff --git a/.github/workflows/ci-x86.yml b/.github/workflows/ci-x86.yml
@@ -75,6 +75,10 @@ jobs:
           zlib1g:i386 zlib1g-dev:i386
         mkdir ../extract
         for i in *.deb; do dpkg-deb -x $i ../extract; done
+        # find_package(ZLIB) doesn't find /lib32, yet ld.so seems to need lib32,
+        # so we do both:
+        sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
+        sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
         sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /lib32/
         sudo rsync -av ../extract/lib/i386-linux-gnu/ /lib32/
         sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/