diff options
| author |   Oskari Pirhonen <xxc3ncoredxx@gmail.com> | 2022-12-04 19:22:07 -0600 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-12-10 01:46:43 +0000 |
| commit | ddaf25365f74227dc581b9e2c38b0c0cc9c6d6b5 (patch) | |
| tree | 3c78d6fa6000f19bd4369f8094965cadd5b2f416 | |
| parent | NEWS: retroactively add bug reference for ROOT rebuild fix (diff) | |
| download | portage-ddaf25365f74227dc581b9e2c38b0c0cc9c6d6b5.tar.gz portage-ddaf25365f74227dc581b9e2c38b0c0cc9c6d6b5.tar.bz2 portage-ddaf25365f74227dc581b9e2c38b0c0cc9c6d6b5.zip | |
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 <xxc3ncoredxx@gmail.com>
Closes: https://github.com/gentoo/portage/pull/957
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | bin/install-qa-check.d/60pkgconfig | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |