rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Remove egrep uses that have crept back in

Browse Source 
egrep will start to warn in the next coreutils release.
This commit is contained in:
Florian Weimer 2022-07-05 11:03:37 +02:00
parent 9d11138b6b
commit 5c27a7014b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glibc.req.in
View File

@ -28,10 +28,10 @@ eu-elfclassify --loadable --file --stdin --print | while read path; do
if $searching; then if $searching; then
# Undefined symbols within latest, under-development # Undefined symbols within latest, under-development
# (changing) symbol versions trigger the versioned RPM # (changing) symbol versions trigger the versioned RPM
# dependency. Do not use "egrep -q" to keep reading from the # dependency. Do not use "grep -Eq" to keep reading from the
# pipe, avoiding a spurious EPIPE error in eu-readelf. # pipe, avoiding a spurious EPIPE error in eu-readelf.
if eu-readelf -s "$path" \ if eu-readelf -s "$path" \
| egrep '\sUNDEF\s.*@''@SYMVER@(\s|$)' >/dev/null | grep -E '\sUNDEF\s.*@''@SYMVER@(\s|$)' >/dev/null
then then
echo 'glibc >= @VERSION@-@RELEASE@' echo 'glibc >= @VERSION@-@RELEASE@'
# Stop searching after the first match, but keep reading from # Stop searching after the first match, but keep reading from

4
glibc.spec
View File

@ -1716,8 +1716,8 @@ grep '%{_prefix}/include/gnu/stubs-.*\.h$' < master.filelist >> devel.filelist |
grep '%{_prefix}/include/gnu/lib-names-.*\.h$' < master.filelist >> devel.filelist || : grep '%{_prefix}/include/gnu/lib-names-.*\.h$' < master.filelist >> devel.filelist || :
# Put the include files into headers file list. # Put the include files into headers file list.
grep '%{_prefix}/include' < master.filelist \ grep '%{_prefix}/include' < master.filelist \
| egrep -v '%{_prefix}/include/gnu/stubs-.*\.h$' \ | grep -E -v '%{_prefix}/include/gnu/stubs-.*\.h$' \
| egrep -v '%{_prefix}/include/gnu/lib-names-.*\.h$' \ | grep -E -v '%{_prefix}/include/gnu/lib-names-.*\.h$' \
> headers.filelist > headers.filelist
%else %else
# If there is no glibc-headers package, all header files go into the # If there is no glibc-headers package, all header files go into the