From ddaf25365f74227dc581b9e2c38b0c0cc9c6d6b5 Mon Sep 17 00:00:00 2001 From: Oskari Pirhonen Date: Sun, 4 Dec 2022 19:22:07 -0600 Subject: install-qa-check.d/60pkgconfig: remove PCRE The pattern in question works with both `grep -P` and `grep -E`, prefer the latter to avoid having to check if grep is built with PCRE support. '=(/usr)?/lib\b' Bug: https://bugs.gentoo.org/884285 Signed-off-by: Oskari Pirhonen Closes: https://github.com/gentoo/portage/pull/957 Signed-off-by: Sam James --- NEWS | 2 ++ bin/install-qa-check.d/60pkgconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ea9967d0f..8f4983e06 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Features: Bug fixes: * glsa: Abort if a GLSA's arch list doesn't match the expected format (bug #882797). +* install-qa-check.d: 60pkgconfig: avoid using grep -P (PCRE) unnecessarily (bug #884285). + * etc-update: Apply defences for patsub_replacement being default on in Bash 5.2 (bug #881383). diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index f44ec232a..c982dbdf4 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -77,7 +77,7 @@ pkgconfig_check() { 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 '=(/usr)?/lib\b' ${f} ; then + if grep -E -q '=(/usr)?/lib\b' ${f} ; then bad_libdir+=( "${f//${D}}" ) fi fi -- cgit v1.2.3-65-gdbad