From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/
Date: Sat, 23 Sep 2023 12:56:11 +0000 (UTC) [thread overview]
Message-ID: <1695473769.d57c266058fcfd2bc3f535a832ab86efde3fb0ab.sam@gentoo> (raw)
commit: d57c266058fcfd2bc3f535a832ab86efde3fb0ab
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 20 07:59:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 12:56:09 2023 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=d57c2660
cross-pkg-config: Properly set PKG_CONFIG_SYSTEM_*_PATH variables
Perhaps this was a difference between pkg-config and pkgconf, but we
have not set PKG_CONFIG_SYSTEM_LIBRARY_PATH correctly since we began
setting it in 2014. It should include the SYSROOT. We also never set
PKG_CONFIG_SYSTEM_INCLUDE_PATH at all.
These variables tell pkg-config not to emit paths that the toolchain
would search in anyway. This helps to reduce the noise appearing in
newly-installed .pc files.
This change does assume that if you have set SYSROOT differently to the
toolchain's default, then you have also added the --sysroot argument to
your compiler flags. Neither Portage nor Gentoo currently do this for
you. cross-boss does, but it's not an officially supported solution. The
change could therefore potentially break things, but it's likely you'll
run into other problems if you don't add --sysroot anyway.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Closes: https://github.com/gentoo/crossdev/pull/13
Signed-off-by: Sam James <sam <AT> gentoo.org>
wrappers/cross-pkg-config | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
index 4e4da92..ba4d3ac 100755
--- a/wrappers/cross-pkg-config
+++ b/wrappers/cross-pkg-config
@@ -118,7 +118,9 @@ if [ -z "${libdir}" ] ; then
libdir=${libdir##*/}
fi
: ${libdir:=lib}
-export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PREFIX}/usr/${libdir}:${PREFIX}/${libdir}"
+export \
+ PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_ESYSROOT_DIR}/usr/${libdir}:${PKG_CONFIG_ESYSROOT_DIR}/${libdir}" \
+ PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_ESYSROOT_DIR}/usr/include"
#
# Set the pkg-config search paths to our staging directory.
next reply other threads:[~2023-09-23 12:56 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-23 12:56 Sam James [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-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-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=1695473769.d57c266058fcfd2bc3f535a832ab86efde3fb0ab.sam@gentoo \
--to=sam@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