From 8b3391ee4540c4ee139a29f077142e550c9bdb5b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 8 Jan 2010 05:11:37 -0500 Subject: cross-pkg-config: switch to PKG_CONFIG_SYSROOT_DIR (kind of) The latest pkg-config supports PKG_CONFIG_SYSROOT_DIR which handles -L/-I munging on the fly, but it's slightly broken. So put all the pieces in place for the next upstream release and in the mean time, do the munging ourselves on the fly via sed. This way packages that want runtime paths compiled in don't get the build paths that were munged in the .pc file. URL: http://bugs.gentoo.org/299990 URL: https://bugs.freedesktop.org/show_bug.cgi?id=16905 Reported-by: Andrew Gaffney Signed-off-by: Mike Frysinger --- wrappers/cross-fix-root | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'wrappers/cross-fix-root') diff --git a/wrappers/cross-fix-root b/wrappers/cross-fix-root index 234f2bb..97bb783 100755 --- a/wrappers/cross-fix-root +++ b/wrappers/cross-fix-root @@ -59,14 +59,7 @@ if [ -d "${LIBDIR}" ] ; then -e "/^dependency_libs=/s: /usr/lib/: ${SYSROOT}/usr/lib/:g" fi -set -- -for d in "./${LIBDIR}/pkgconfig/" ./usr/share/pkgconfig/ ; do - [ -d "$d" ] && set -- "$@" "${d}" -done -if [ $# -gt 0 ] ; then - find "$@" -name '*.pc' -print0 | xargs -0 -r \ - sed -i -r -e "/^(exec_)?prefix=/s:=/usr\$:='${SYSROOT}/usr':" -fi +# we don't touch .pc files anymore as we require pkg-config 0.23+ and PKG_CONFIG_SYSROOT_DIR if [ -d usr/bin ] ; then find ./usr/bin/ -name '*-config' -print0 | xargs -0 -r \ -- cgit v1.2.3-65-gdbad