| 1 |
commit: 06af67ad303d2f0d8a82c4d6cd4c594d7694689b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 1 02:41:09 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=06af67ad |
| 7 |
|
| 8 |
install-qa-check.d: 60pkgconfig: only verify defined variables in EPREFIX check |
| 9 |
|
| 10 |
e.g. 'exec_prefix' might not even appear in the pkg-config file. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/860825 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
bin/install-qa-check.d/60pkgconfig | 3 +++ |
| 16 |
1 file changed, 3 insertions(+) |
| 17 |
|
| 18 |
diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig |
| 19 |
index d4ba42f5b..6f1d6b8b1 100644 |
| 20 |
--- a/bin/install-qa-check.d/60pkgconfig |
| 21 |
+++ b/bin/install-qa-check.d/60pkgconfig |
| 22 |
@@ -38,6 +38,9 @@ pkgconfig_check() { |
| 23 |
for f in "${files[@]}" ; do |
| 24 |
local key |
| 25 |
for key in prefix exec_prefix libdir includedir ; do |
| 26 |
+ # Check if the variable is even in there (bug #860825) |
| 27 |
+ grep -E -q "^${key}" "${f}" || continue |
| 28 |
+ |
| 29 |
local value=$(pkg-config --variable="${key}" "${f}") |
| 30 |
|
| 31 |
if [[ ${value} != "${EPREFIX}"* ]] ; then |
Archives