Skip to content

Commit ef0a679

Browse files
committed
fix: do not install anything to /usr/lib64
Avoid breaking multilib symlinks Signed-off-by: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com>
1 parent 35748ea commit ef0a679

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

pahole/pkg.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ steps:
4242
cd build
4343
make DESTDIR=/rootfs install
4444
rm -rf /rootfs/usr/share
45+
mkdir -p /rootfs/usr/lib
46+
mv /rootfs/usr/lib64/* /rootfs/usr/lib/
47+
rm -r /rootfs/usr/lib64
4548
finalize:
4649
- from: /rootfs
4750
to: /

protobuf/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
- |
2020
tar -xzf protobuf.tar.gz --strip-components=1
2121
22-
cmake . -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_ABSL_PROVIDER=package -DCMAKE_INSTALL_PREFIX=/usr
22+
cmake . -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_ABSL_PROVIDER=package -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
2323
build:
2424
- |
2525
make -j $(nproc)

0 commit comments

Comments
 (0)