From 842b1b8e87c39ad2f727594d5e52441337a6c5d1 Mon Sep 17 00:00:00 2001 From: Christian Melki Date: Mon, 26 Apr 2021 23:03:11 +0200 Subject: Resolve lib and pkgconfig dirs dynamically. Toolchains usually adhere to ABI spec when dealing with ld.so placement. https://sourceware.org/glibc/wiki/ABIList On x86_64: /lib64/ld-linux-x86-64.so.2 This will help in using a non-demultilibbed toolchain in ptxdist. Signed-off-by: Christian Melki Message-Id: <20210426210311.18897-1-christian.melki@t2data.com> Signed-off-by: Michael Olbrich --- scripts/lib/ptxd_make_world_install.sh | 2 +- scripts/pkg-config-wrapper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index e878a3231..91179e3cb 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -238,7 +238,7 @@ ptxd_make_world_install_post() { ptxd_make_world_init && ( if [ -n "${pkg_pkg_dir}" -a -d "${pkg_pkg_dir}" ]; then - find "${pkg_pkg_dir}"{,/usr}/{lib,share}/pkgconfig -name *.pc \ + find "${pkg_pkg_dir}"{,/usr}/{$(ptxd_get_lib_dir),share}/pkgconfig -name *.pc \ -printf "%f\n" 2>/dev/null | sed 's/\.pc$//' elif [ "${pkg_type}" != "target" -a -n "${pkg_build_dir}" -a -d "${pkg_build_dir}" ]; then # workaround for packages that install directly to sysroot diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper index 53be1a987..d86fa7c68 100755 --- a/scripts/pkg-config-wrapper +++ b/scripts/pkg-config-wrapper @@ -17,7 +17,7 @@ else fi declare -a libdir system_path system_incpath -libdir=( "${prefix/%//lib/pkgconfig}" "${prefix/%//share/pkgconfig}" ) +libdir=( $(find ${prefix} -maxdepth 3 -type d -name pkgconfig) ) system_libpath=( "${libdir[@]/%//../../lib}" "${libdir[@]/%//../lib}" "/usr/lib" "/lib" ) system_incpath=( "${libdir[@]/%//../../include}" "${libdir[@]/%//../include}" "/usr/include" "/include" ) -- cgit v1.2.3