Merge pull request #1476 from chainguard-dev/fix-lib64

fix(split pipelines): Don't split lib64 libraries
chainguard-dev · Sep 5, 2024 · 10a9185 · 10a9185
2 parents df98c9f + 00b2c63
commit 10a9185
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/pkg/build/pipelines/split/dev.yaml b/pkg/build/pipelines/split/dev.yaml
@@ -26,14 +26,12 @@ pipeline:
 
       libdirs=usr/
       [ -d lib/ ] && libdirs="lib/ $libdirs"
-      [ -d lib64/ ] && libdirs="lib64/ $libdirs"
       for i in usr/include usr/lib/pkgconfig usr/share/pkgconfig \
         usr/share/aclocal usr/share/gettext \
         usr/bin/*-config usr/bin/*_config usr/share/vala/vapi \
         usr/share/gir-[0-9]* usr/share/qt*/mkspecs \
         usr/lib/qt*/mkspecs usr/lib/cmake \
         usr/lib/glade/modules usr/share/glade/catalogs \
-        usr/local/*/include usr/local/*/lib64 \
         $(find . -name include -type d) \
         $(find $libdirs -name '*.a' 2>/dev/null) \
         $(find $libdirs -name '*.[cho]' \

diff --git a/pkg/build/pipelines/split/static.yaml b/pkg/build/pipelines/split/static.yaml
@@ -26,7 +26,6 @@ pipeline:
 
       libdirs=usr/
       [ -d lib/ ] && libdirs="lib/ $libdirs"
-      [ -d lib64/ ] && libdirs="lib64/ $libdirs"
       for i in \
         $(find $libdirs -name '*.a' 2>/dev/null); do
             if [ -e "$PACKAGE_DIR/$i" ] || [ -L "$PACKAGE_DIR/$i" ]; then