From: "Mike Frysinger" <vapier@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/ Date: Wed, 17 Sep 2014 21:41:35 +0000 (UTC) [thread overview] Message-ID: <1406604791.b800ebdbe6e8d22701d1203a298bdba92a735f49.vapier@gentoo> (raw) commit: b800ebdbe6e8d22701d1203a298bdba92a735f49 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Tue Jul 29 03:33:11 2014 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Tue Jul 29 03:33:11 2014 +0000 URL: http://sources.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 <mike <AT> marineau.org> Signed-off-by: Mike Frysinger <vapier <AT> 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}.
WARNING: multiple messages have this Message-ID (diff)
From: "Mike Frysinger" <vapier@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/ Date: Tue, 29 Jul 2014 06:07:03 +0000 (UTC) [thread overview] Message-ID: <1406604791.b800ebdbe6e8d22701d1203a298bdba92a735f49.vapier@gentoo> (raw) Message-ID: <20140729060703.U8CImOG2H7Db-NgiWrL6GrPuyqWcNB8oggzFQAlVIF4@z> (raw) commit: b800ebdbe6e8d22701d1203a298bdba92a735f49 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Tue Jul 29 03:33:11 2014 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> 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 <mike <AT> marineau.org> Signed-off-by: Mike Frysinger <vapier <AT> 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}.
next reply other threads:[~2014-09-17 21:41 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-09-17 21:41 Mike Frysinger [this message] 2014-07-29 6:07 ` [gentoo-commits] proj/crossdev:master commit in: wrappers/ Mike Frysinger -- strict thread matches above, loose matches on Subject: below -- 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-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 2012-02-27 23:13 Mike Frysinger 2011-10-18 17:36 Mike Frysinger
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=1406604791.b800ebdbe6e8d22701d1203a298bdba92a735f49.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: linkBe 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