From ef0a67955aa9191019e5ea2fe0fe572694606b02 Mon Sep 17 00:00:00 2001 From: Dmitry Sharshakov Date: Tue, 4 Feb 2025 13:07:28 +0100 Subject: [PATCH] fix: do not install anything to /usr/lib64 Avoid breaking multilib symlinks Signed-off-by: Dmitry Sharshakov --- pahole/pkg.yaml | 3 +++ protobuf/pkg.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pahole/pkg.yaml b/pahole/pkg.yaml index 0846798..cd7dc51 100644 --- a/pahole/pkg.yaml +++ b/pahole/pkg.yaml @@ -42,6 +42,9 @@ steps: cd build make DESTDIR=/rootfs install rm -rf /rootfs/usr/share + mkdir -p /rootfs/usr/lib + mv /rootfs/usr/lib64/* /rootfs/usr/lib/ + rm -r /rootfs/usr/lib64 finalize: - from: /rootfs to: / diff --git a/protobuf/pkg.yaml b/protobuf/pkg.yaml index 60a203d..f1df13d 100644 --- a/protobuf/pkg.yaml +++ b/protobuf/pkg.yaml @@ -19,7 +19,7 @@ steps: - | tar -xzf protobuf.tar.gz --strip-components=1 - cmake . -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_ABSL_PROVIDER=package -DCMAKE_INSTALL_PREFIX=/usr + cmake . -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_ABSL_PROVIDER=package -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib build: - | make -j $(nproc)