Skip to content

Commit a3b047d

Browse files
committed
configure.ac, scripts/Windows/dllldd.sh: use question mark in grep regex, that seems to work everywhere and suits the purpose better [#2920]
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
1 parent 9d55c74 commit a3b047d

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3703,7 +3703,7 @@ no)
37033703
if test -n "${DOC_CANNOTBUILD_LIST}"; then
37043704
DOC_CANNOTBUILD_LIST_LINES="`echo "${DOC_CANNOTBUILD_LIST}" | tr ' ' '\n' | grep -vE '^$'`"
37053705
for DOCTYPE in ${DOC_BUILD_LIST} ; do
3706-
if echo "${DOC_CANNOTBUILD_LIST_LINES}" | grep -E "^${DOCTYPE}(=yes)*\$" ; then
3706+
if echo "${DOC_CANNOTBUILD_LIST_LINES}" | grep -E "^${DOCTYPE}(=yes)?\$" ; then
37073707
AC_MSG_ERROR([Unable to build${DOC_CANNOTBUILD_LIST} documentation (check for 'no' results above)])
37083708
else if echo "${DOC_CANNOTBUILD_LIST_LINES}" | grep -E "^${DOCTYPE}=(skip|auto|dist-auto)\$" ; then
37093709
AC_MSG_NOTICE([Unable to build${DOC_CANNOTBUILD_LIST} documentation (check for 'no' results above), skipping])

scripts/Windows/dllldd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dllldd() (
2626
for OD in objdump "$ARCH-objdump" ; do
2727
(command -v "$OD" >/dev/null 2>/dev/null) || continue
2828

29-
ODOUT="`$OD -x "$@" 2>/dev/null | grep -Ei "DLL Name:" | awk '{print $NF}' | sort | uniq | grep -vEi '^(/.*/)*(msvcrt|userenv|bcrypt|rpcrt4|usp10|(advapi|kernel|user|wsock|ws2_|gdi|ole||shell)(32|64))\.dll$'`" \
29+
ODOUT="`$OD -x "$@" 2>/dev/null | grep -Ei "DLL Name:" | awk '{print $NF}' | sort | uniq | grep -vEi '^(/.*/)?(msvcrt|userenv|bcrypt|rpcrt4|usp10|(advapi|kernel|user|wsock|ws2_|gdi|ole||shell)(32|64))\.dll$'`" \
3030
&& [ -n "$ODOUT" ] || continue
3131

3232
for F in $ODOUT ; do

0 commit comments

Comments
 (0)