[gentoo-commits] gentoo-projects commit in crossdev-wrappers: cross-fix-root cross-pkg-config

[Mike Frysinger (vapier)]

vapier      10/01/08 09:17:27

  Modified:             cross-fix-root cross-pkg-config
  Log:
  cross-pkg-config: switch to PKG_CONFIG_SYSROOT_DIR

Revision  Changes    Path
1.10                 crossdev-wrappers/cross-fix-root

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-fix-root?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-fix-root?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-fix-root?r1=1.9&r2=1.10

Index: cross-fix-root
===================================================================
RCS file: /var/cvsroot/gentoo-projects/crossdev-wrappers/cross-fix-root,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cross-fix-root	8 Jan 2010 07:10:34 -0000	1.9
+++ cross-fix-root	8 Jan 2010 09:17:27 -0000	1.10
@@ -59,14 +59,7 @@
 			-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 \



1.9                  crossdev-wrappers/cross-pkg-config

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-pkg-config?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-pkg-config?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-pkg-config?r1=1.8&r2=1.9

Index: cross-pkg-config
===================================================================
RCS file: /var/cvsroot/gentoo-projects/crossdev-wrappers/cross-pkg-config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cross-pkg-config	8 Jan 2010 07:16:34 -0000	1.8
+++ cross-pkg-config	8 Jan 2010 09:17:27 -0000	1.9
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2008-2009 Gentoo Foundation
+# Copyright 2008-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #
@@ -23,7 +23,7 @@
 #
 # Sanity/distro checks
 #
-MIN_VER="0.20"
+MIN_VER="0.23" # needs PKG_CONFIG_SYSROOT_DIR
 if ! pkg-config --atleast-pkgconfig-version ${MIN_VER} ; then
 	error pkg-config is too old ... upgrade to at least v${MIN_VER}
 fi
@@ -79,6 +79,12 @@
 if [ -n "${EXTRA_PKG_CONFIG_LIBDIR}" ] ; then
 	PKG_CONFIG_LIBDIR="${EXTRA_PKG_CONFIG_LIBDIR}:${PKG_CONFIG_LIBDIR}"
 fi
+#
+# This guy is horribly broken in pkg-config <=0.23:
+#	https://bugs.freedesktop.org/show_bug.cgi?id=16905
+#
+#export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
+unset PKG_CONFIG_SYSROOT_DIR
 
 #
 # Sanity check the output to catch common errors that do not
@@ -86,6 +92,14 @@
 #
 output=$(pkg-config "$@")
 ret=$?
+
+#
+# Inject PKG_CONFIG_SYSROOT_DIR ourselves until pkg-config is fixed.
+# We can't mung the .pc files as some of the vars are used at compile
+# time to encode runtime paths.
+#
+output=$(echo "${output}" | sed -e 's:\(-[IL][[:space:]]*\)\(/usr\):\1'"${SYSROOT}"'\2:g')
+
 case " ${output} " in
 	*" -L/usr/lib "*|*" -L/usr/local/lib "*|\
 	*" -L /usr/lib "*|*" -L /usr/local/lib "*|\