From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1424309-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B4347158094
for <garchives@archives.gentoo.org>; Mon, 1 Aug 2022 22:39:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5C1E0E0C12;
Mon, 1 Aug 2022 22:39:14 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 38288E0BD8
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Aug 2022 22:39:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E1DBC340CD8
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Aug 2022 22:39:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 70A98326
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Aug 2022 22:39:10 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1659393471.06af67ad303d2f0d8a82c4d6cd4c594d7694689b.sam@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/install-qa-check.d/60pkgconfig
X-VCS-Directories: bin/install-qa-check.d/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 06af67ad303d2f0d8a82c4d6cd4c594d7694689b
X-VCS-Branch: master
Date: Mon, 1 Aug 2022 22:39:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 85bb0292-eae3-483e-bd41-8f3d175a8acc
X-Archives-Hash: e8229d7d3dd9f91cc9afb6e0cf8191d4
commit: 06af67ad303d2f0d8a82c4d6cd4c594d7694689b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 02:41:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 1 22:37:51 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=06af67ad
install-qa-check.d: 60pkgconfig: only verify defined variables in EPREFIX check
e.g. 'exec_prefix' might not even appear in the pkg-config file.
Bug: https://bugs.gentoo.org/860825
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/install-qa-check.d/60pkgconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig
index d4ba42f5b..6f1d6b8b1 100644
--- a/bin/install-qa-check.d/60pkgconfig
+++ b/bin/install-qa-check.d/60pkgconfig
@@ -38,6 +38,9 @@ pkgconfig_check() {
for f in "${files[@]}" ; do
local key
for key in prefix exec_prefix libdir includedir ; do
+ # Check if the variable is even in there (bug #860825)
+ grep -E -q "^${key}" "${f}" || continue
+
local value=$(pkg-config --variable="${key}" "${f}")
if [[ ${value} != "${EPREFIX}"* ]] ; then