[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

[Sam James]

commit:     e31acf622d632d093b01e51e03c1c3f98dbe3a1c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 00:02:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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