From c0d8e9a6de9b331f3a985f9ba128fa7e65dca395 Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Sat, 13 Jan 2024 16:53:05 -0500 Subject: [PATCH] Copy to both /lib32 (for ld.so) and /usr/lib/i386-linux-gnu/ (for cmake find_package) --- .github/workflows/ci-clang.yml | 4 ++++ .github/workflows/ci-package.yml | 4 ++++ .github/workflows/ci-x86.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/ci-clang.yml b/.github/workflows/ci-clang.yml index 8352df79..ee5e6d8b 100644 --- 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 index ecc06d1e..1a665061 100644 --- 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 index 41c6ea9c..0bbf419f 100644 --- 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/