Skip to content

Commit

Permalink
common: make pkg-config-wrapper look under lib
Browse files Browse the repository at this point in the history
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
  • Loading branch information
newbluemoon committed Jan 28, 2025
1 parent 0112f41 commit 31b6109
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion common/hooks/pre-configure/02-script-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pkgconfig_wrapper() {
export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
exec /usr/bin/pkg-config "\$@"
exec /usr/bin/pkg-config "\$@" | sed s/lib32/lib/g
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
if [ -z "$no_generic_pkgconfig_link" ]; then
Expand Down

0 comments on commit 31b6109

Please sign in to comment.