Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
Date: Mon, 01 Aug 2022 22:39:15
Message-Id: 1659393471.4f7f71fe7fca2744954d0092c3095221905f7e04.sam@gentoo
1 commit: 4f7f71fe7fca2744954d0092c3095221905f7e04
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 1 02:47:56 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 1 22:37:51 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4f7f71fe
7
8 install-qa-check.d: 60pkgconfig: add ${ED}/usr/{lib*,share}/pkgconfig to search path
9
10 Needed for --validate to not barf sometimes.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13 Closes: https://github.com/gentoo/portage/pull/880
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 bin/install-qa-check.d/60pkgconfig | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig
20 index 6f1d6b8b1..54122fe61 100644
21 --- a/bin/install-qa-check.d/60pkgconfig
22 +++ b/bin/install-qa-check.d/60pkgconfig
23 @@ -27,7 +27,7 @@ pkgconfig_check() {
24 # seems like f.d.o, OpenBSD, and of course pkgconf do though.
25 # Need --maximum-traverse-depth=1 to avoid checking deps and giving
26 # unrelated warnings/errors.
27 - if ! pkg-config --maximum-traverse-depth=1 --validate "${files[@]}" ; then
28 + if ! pkg-config --maximum-traverse-depth=1 --with-path="${ED}"/usr/{lib*,share}/pkgconfig --validate "${files[@]}" ; then
29 eqawarn "QA Notice: pkg-config files which fail validation found!"
30 eqawarn "Run 'pkg-config --validate ...' for more information"
31 fi