From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B838C13877A for ; Tue, 29 Jul 2014 06:07:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7368FE0CD9; Tue, 29 Jul 2014 06:07:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F12D7E0CD9 for ; Tue, 29 Jul 2014 06:07:05 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01B3C34013B for ; Tue, 29 Jul 2014 06:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 230EA18BF3 for ; Tue, 29 Jul 2014 06:07:03 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1406604791.b800ebdbe6e8d22701d1203a298bdba92a735f49.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: b800ebdbe6e8d22701d1203a298bdba92a735f49 X-VCS-Branch: master Date: Tue, 29 Jul 2014 06:07:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 85ffb4d2-19d5-43e1-b6c2-b2e13c9167ec X-Archives-Hash: 63cdd7090bb71c84c5d7c2897c16146a Message-ID: <20140729060703.U8CImOG2H7Db-NgiWrL6GrPuyqWcNB8oggzFQAlVIF4@z> commit: b800ebdbe6e8d22701d1203a298bdba92a735f49 Author: Mike Frysinger gentoo org> AuthorDate: Tue Jul 29 03:33:11 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Jul 29 03:33:11 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=b800ebdb cross-pkg-config: utilize PKG_CONFIG_SYSROOT_DIR Now that the 0.24 release has been out for a few years, we can start relying on its availability. URL: https://bugs.gentoo.org/517530 Reported-by: Mike Marineau marineau.org> Signed-off-by: Mike Frysinger gentoo.org> --- wrappers/cross-pkg-config | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config index d124261..859ef05 100755 --- a/wrappers/cross-pkg-config +++ b/wrappers/cross-pkg-config @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2008-2010 Gentoo Foundation +# Copyright 2008-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @@ -23,7 +23,7 @@ error() { # # Sanity/distro checks # -MIN_VER="0.20" # needs PKG_CONFIG_SYSROOT_DIR +MIN_VER="0.24" # needs working 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 @@ -81,12 +81,7 @@ export PKG_CONFIG_LIBDIR="${SYSROOT}/usr/lib/pkgconfig:${SYSROOT}/usr/share/pkgc 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 +export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}" # # Sanity check the output to catch common errors that do not @@ -95,13 +90,6 @@ unset PKG_CONFIG_SYSROOT_DIR 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') - # We turn the output into a newline separate string of options, then use grep # to look for bad -Is and -Ls. Bad -Is and -Ls are ones that point to things # outside the ${SYSROOT}.