From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S29lG-00019w-GU for garchives@archives.gentoo.org; Mon, 27 Feb 2012 23:13:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D87FE0799; Mon, 27 Feb 2012 23:13:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3FE11E0799 for ; Mon, 27 Feb 2012 23:13:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A47CA1B400F for ; Mon, 27 Feb 2012 23:13:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 66BC6E53FE for ; Mon, 27 Feb 2012 23:13:33 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1330383513.f2920e67f3747925f72e04b89f193e79f6ff8ab4.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: wrappers/cross-pkg-config X-VCS-Directories: wrappers/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f2920e67f3747925f72e04b89f193e79f6ff8ab4 X-VCS-Branch: master Date: Mon, 27 Feb 2012 23:13:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b709a7bb-1fbd-4d70-92b6-ef24f924303a X-Archives-Hash: d07607cee5866b71401ed310dbd92e61 commit: f2920e67f3747925f72e04b89f193e79f6ff8ab4 Author: Mike Frysinger gentoo org> AuthorDate: Mon Feb 27 22:58:33 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Feb 27 22:58:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3Df2920e67 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 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" =3D "--cross-pkg-config-install" ] ; then fi =20 unset EXTRA_PKG_CONFIG_LIBDIR -if [ "@CROSS_PKG_CONFIG_INSTALLED@" =3D "installed" ] ; then - # Manual install - SYSROOT=3D"@CROSS_PKG_CONFIG_PATH@" -elif [ -n "${ROOT}" ] ; then - # Gentoo - SYSROOT=3D${ROOT} -elif [ -n "${STAGEDIR}" ] ; then - # uClinux-dist - SYSROOT=3D${STAGEDIR} - EXTRA_PKG_CONFIG_LIBDIR=3D${UCLINUX_PKG_CONFIG_LIBDIR} -else - # /usr/ - CHOST=3D${0##*/} - CHOST=3D${CHOST%-pkg-config} - SYSROOT=3D"/usr/${CHOST}" - if [ -z "${CHOST}" ] || [ ! -d "${SYSROOT}" ] ; then - error "Need \$ROOT or \$STAGEDIR set first" +if [ -z "${SYSROOT}" ] ; then + if [ "@CROSS_PKG_CONFIG_INSTALLED@" =3D "installed" ] ; then + # Manual install + SYSROOT=3D"@CROSS_PKG_CONFIG_PATH@" + elif [ -n "${ROOT}" ] ; then + # Gentoo + SYSROOT=3D${ROOT} + elif [ -n "${STAGEDIR}" ] ; then + # uClinux-dist + SYSROOT=3D${STAGEDIR} + EXTRA_PKG_CONFIG_LIBDIR=3D${UCLINUX_PKG_CONFIG_LIBDIR} + else + # /usr/ + CHOST=3D${0##*/} + CHOST=3D${CHOST%-pkg-config} + SYSROOT=3D"/usr/${CHOST}" + if [ -z "${CHOST}" ] || [ ! -d "${SYSROOT}" ] ; then + error "Need \$ROOT or \$STAGEDIR set first" + fi fi fi # abort infinite loop due to misconfiguration