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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/
Date: Mon, 27 Feb 2012 23:13:33 +0000 (UTC)	[thread overview]
Message-ID: <1330383513.f2920e67f3747925f72e04b89f193e79f6ff8ab4.vapier@gentoo> (raw)

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

next             reply	other threads:[~2012-02-27 23:13 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-27 23:13 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-24 17:12 [gentoo-commits] proj/crossdev:master commit in: wrappers/ Mike Gilbert
2025-01-29 17:42 Mike Gilbert
2024-11-30  2:08 Sam James
2024-09-22  8:35 James Le Cuirot
2024-05-04 11:58 Sam James
2024-01-08 14:28 Sam James
2023-10-15  4:23 Matt Turner
2023-09-23 12:56 Sam James
2023-06-16 20:21 Mike Gilbert
2022-12-27 16:06 Sam James
2022-08-18 21:57 Sam James
2022-08-18 21:57 Sam James
2022-01-13  8:20 Mike Frysinger
2022-01-13  8:20 Mike Frysinger
2021-11-26 19:02 Mike Frysinger
2021-10-27  8:55 Mike Frysinger
2021-06-21 21:23 Sergei Trofimovich
2021-01-17  8:09 Sergei Trofimovich
2019-08-30  7:32 Sergei Trofimovich
2019-07-21 13:41 James Le Cuirot
2019-07-12  7:24 Sergei Trofimovich
2019-03-18 22:54 Sergei Trofimovich
2019-03-11 22:13 Sergei Trofimovich
2018-10-20 20:08 Sergei Trofimovich
2018-04-05  6:56 Sergei Trofimovich
2018-03-24 15:13 Sergei Trofimovich
2018-03-10 13:07 Sergei Trofimovich
2017-12-30 22:37 Sergei Trofimovich
2017-12-30 17:45 Sergei Trofimovich
2016-01-16  8:22 Mike Frysinger
2015-07-23  3:47 Mike Frysinger
2014-10-31  1:56 Mike Frysinger
2014-10-31  1:56 Mike Frysinger
2014-10-31  0:52 Mike Frysinger
2014-09-18 16:52 Mike Frysinger
2014-09-17 21:41 Mike Frysinger
2014-07-29  6:07 ` Mike Frysinger
2014-09-17 21:41 Mike Frysinger
2014-09-17 21:41 Mike Frysinger
2014-07-29  6:07 ` Mike Frysinger
2014-03-27  6:43 Mike Frysinger
2014-01-18 19:37 Mike Frysinger
2013-12-23  3:06 Mike Frysinger
2013-01-28 22:51 Mike Frysinger
2011-10-18 17:36 Mike Frysinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b39bbf6 dfblob:37f3690 )
 OR (
bs:"[gentoo-commits] proj/crossdev:master commit in: wrappers/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330383513.f2920e67f3747925f72e04b89f193e79f6ff8ab4.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox