From a7f386f1c5f224bb248ef4bc3744126f49f4ad5b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 Apr 2025 07:41:58 +0200 Subject: [PATCH] pahole: Set `LIB_INSTALL_DIR` to fix lib install directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, [the shared libraries are wrongly installed into `/usr/usr/lib`][1]: $ pahole --version pahole: error while loading shared libraries: libdwarves_emit.so.1: cannot open shared object file: No such file or directory $ fakeroot bee query pahole-1.30-0.x86_64 […] /usr/usr/lib /usr/usr/lib/libdwarves_reorganize.so//libdwarves_reorganize.so.1 /usr/usr/lib/libdwarves_reorganize.so.1//libdwarves_reorganize.so.1.0.0 /usr/usr/lib/libdwarves_reorganize.so.1.0.0 /usr/usr/lib/libdwarves_emit.so//libdwarves_emit.so.1 /usr/usr/lib/libdwarves_emit.so.1//libdwarves_emit.so.1.0.0 /usr/usr/lib/libdwarves_emit.so.1.0.0 /usr/usr/lib/libdwarves.so//libdwarves.so.1 /usr/usr/lib/libdwarves.so.1//libdwarves.so.1.0.0 /usr/usr/lib/libdwarves.so.1.0.0 […] The problem is, that `CMAKE_INSTALL_LIBDIR` is treated to be subdirectory of the install prefix and *not* an absolute path: $ more CMakeLists.txt […] if (NOT DEFINED LIB_INSTALL_DIR) set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") endif() […] Explicity set `LIB_INSTALL_DIR` to make the if condition false. $ fakeroot bee query pahole-1.30-1.x86_64 […] /usr/lib/libdwarves_reorganize.so//libdwarves_reorganize.so.1 /usr/lib/libdwarves_reorganize.so.1//libdwarves_reorganize.so.1.0.0 /usr/lib/libdwarves_reorganize.so.1.0.0 /usr/lib/libdwarves_emit.so//libdwarves_emit.so.1 /usr/lib/libdwarves_emit.so.1//libdwarves_emit.so.1.0.0 /usr/lib/libdwarves_emit.so.1.0.0 /usr/lib/libdwarves.so//libdwarves.so.1 /usr/lib/libdwarves.so.1//libdwarves.so.1.0.0 /usr/lib/libdwarves.so.1.0.0 […] $ pahole --version v1.30 Upstream report: https://lore.kernel.org/all/9fb4f7ba-0de1-4f75-9bd2-66212ca8cd86@molgen.mpg.de/ Increment revision to 1. [1]: https://github.molgen.mpg.de/mariux64/bee-files/pull/3227#issuecomment-20308 --- pahole.be0 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pahole.be0 b/pahole.be0 index c6718ac36..4d8724b5f 100755 --- a/pahole.be0 +++ b/pahole.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION pahole-1.30-0 +# BEE_VERSION pahole-1.30-1 #SRCURL[0]="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${PKGVERSION}.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/3787b1177acbe92388853cf0b8ce26f2/pahole-1.30.tar.gz" @@ -21,7 +21,8 @@ SRCURL[0]="https://beehive.molgen.mpg.de/3787b1177acbe92388853cf0b8ce26f2/pahole mee_configure() { bee_configure \ - -DLIBBPF_EMBEDDED=OFF + -DLIBBPF_EMBEDDED=OFF \ + -DLIB_INSTALL_DIR=${LIBDIR} } #mee_build() {