[gentoo-commits] proj/crossdev:master commit in: wrappers/

[Mike Frysinger]

commit:     f2920e67f3747925f72e04b89f193e79f6ff8ab4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 22:58:33 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 22:58:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=f2920e67

cross-pkg-config: use SYSROOT from env if set

If we already have SYSROOT set in the env, just go with that.  This lets
us do multiple sysroots-per-target by manipulating the env.  Idea based
on the work in ChromiumOS.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 wrappers/cross-pkg-config |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
index b39bbf6..37f3690 100755
--- a/wrappers/cross-pkg-config
+++ b/wrappers/cross-pkg-config
@@ -42,23 +42,25 @@ if [ "$1" = "--cross-pkg-config-install" ] ; then
 fi
 
 unset EXTRA_PKG_CONFIG_LIBDIR
-if [ "@CROSS_PKG_CONFIG_INSTALLED@" = "installed" ] ; then
-	# Manual install
-	SYSROOT="@CROSS_PKG_CONFIG_PATH@"
-elif [ -n "${ROOT}" ] ; then
-	# Gentoo
-	SYSROOT=${ROOT}
-elif [ -n "${STAGEDIR}" ] ; then
-	# uClinux-dist
-	SYSROOT=${STAGEDIR}
-	EXTRA_PKG_CONFIG_LIBDIR=${UCLINUX_PKG_CONFIG_LIBDIR}
-else
-	# /usr/<target>
-	CHOST=${0##*/}
-	CHOST=${CHOST%-pkg-config}
-	SYSROOT="/usr/${CHOST}"
-	if [ -z "${CHOST}" ] || [ ! -d "${SYSROOT}" ] ; then
-		error "Need \$ROOT or \$STAGEDIR set first"
+if [ -z "${SYSROOT}" ] ; then
+	if [ "@CROSS_PKG_CONFIG_INSTALLED@" = "installed" ] ; then
+		# Manual install
+		SYSROOT="@CROSS_PKG_CONFIG_PATH@"
+	elif [ -n "${ROOT}" ] ; then
+		# Gentoo
+		SYSROOT=${ROOT}
+	elif [ -n "${STAGEDIR}" ] ; then
+		# uClinux-dist
+		SYSROOT=${STAGEDIR}
+		EXTRA_PKG_CONFIG_LIBDIR=${UCLINUX_PKG_CONFIG_LIBDIR}
+	else
+		# /usr/<target>
+		CHOST=${0##*/}
+		CHOST=${CHOST%-pkg-config}
+		SYSROOT="/usr/${CHOST}"
+		if [ -z "${CHOST}" ] || [ ! -d "${SYSROOT}" ] ; then
+			error "Need \$ROOT or \$STAGEDIR set first"
+		fi
 	fi
 fi
 # abort infinite loop due to misconfiguration