From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 DC95715808B for ; Tue, 12 Apr 2022 02:00:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F416E08DD; Tue, 12 Apr 2022 02:00:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F06C9E08D3 for ; Tue, 12 Apr 2022 02:00:12 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25C90341AC1 for ; Tue, 12 Apr 2022 02:00:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EAC03AB for ; Tue, 12 Apr 2022 02:00:09 +0000 (UTC) From: "Sam James" 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" Message-ID: <1649728796.e31acf622d632d093b01e51e03c1c3f98dbe3a1c.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: e31acf622d632d093b01e51e03c1c3f98dbe3a1c X-VCS-Branch: master Date: Tue, 12 Apr 2022 02:00:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8d8395cb-f86e-499c-aa7c-9af6aa49055a X-Archives-Hash: 1970149afcbc70f1d57cf28f272f50e9 commit: e31acf622d632d093b01e51e03c1c3f98dbe3a1c Author: Sam James gentoo org> AuthorDate: Wed Mar 16 00:02:24 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 12 01:59:56 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31acf62 install-qa-check.d/60pkgconfig: change libdir regex We don't want to watch /var/lib/, for example. Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index e2d839ca1..58f533e83 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -62,19 +62,19 @@ pkgconfig_check() { # e.g. https://bugs.gentoo.org/729642 local bad_libdir=() for f in "${files[@]}" ; do - # In ${ED}/usr/lib, we shouldn't reference lib64 if [[ ${f} == *lib/pkgconfig* ]] ; then if [[ -d "${ED}"/usr/lib && -L "${ED}"/usr/lib ]] ; then # (Don't bother if /usr/lib is a symlink to /usr/lib64) continue fi - if egrep -q "/lib64" ${f} ; then + # In ${ED}/usr/lib, we shouldn't reference lib64 + if egrep -q "=(/usr)?/lib64" ${f} ; then bad_libdir+=( "${f//${D}}" ) fi elif [[ ${f} == *lib64/pkgconfig* ]] ; then # We want to match /lib/, /lib/foo/, but not e.g. /lib64 or /lib64/, or libfoo - if grep -qP '/lib\b' ${f} ; then + if grep -qP '=(/usr)?/lib\b' ${f} ; then bad_libdir+=( "${f//${D}}" ) fi fi