Skip to content

Commit 4e2cbb5

Browse files
committed
common: make pkg-config-wrapper look under lib
instead of lib32 cf. #52402, make 32-bit cross builds find qt-host-tools on a 64-bit host .pc files contain lib32 hardcoded, lib is a symlink to the corresponding lib{32,64} anyway, so let the wrapper look under lib
1 parent 66aa9a1 commit 4e2cbb5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

common/hooks/pre-configure/02-script-wrapper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pkgconfig_wrapper() {
103103
export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
104104
export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
105105
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
106-
exec /usr/bin/pkg-config "\$@"
106+
exec /usr/bin/pkg-config "\$@" | sed s/lib32/lib/g
107107
_EOF
108108
chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
109109
if [ -z "$no_generic_pkgconfig_link" ]; then

0 commit comments

Comments
 (0)