Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-42874: Remove grep -qE options for Solaris 10 compatibility #24200

Merged
merged 1 commit into from
Jan 12, 2021
+5 −2
Merged

bpo-42874: Remove grep -qE options for Solaris 10 compatibility #24200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Build/2021-01-12-10-06-50.bpo-42874.XKK61g.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Removed the grep -q and -E flags in the tzpath validation section of the
configure script to better accomodate users of some platforms (specifically
Solaris 10).
2 changes: 1 addition & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10252,7 +10252,7 @@ validate_tzpath() {
fi

# Bad paths are those that don't start with /
if ( echo $1 | grep -qE '(^|:)([^/]|$)' ); then
if ( echo $1 | grep '\(^\|:\)\([^/]\|$\)' > /dev/null); then
as_fn_error $? "--with-tzpath must contain only absolute paths, not $1" "$LINENO" 5
return 1;
fi
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2980,7 +2980,7 @@ validate_tzpath() {

# Bad paths are those that don't start with /
dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
if ( echo $1 | grep -qE '(^|:)(@<:@^/@:>@|$)' ); then
if ( echo $1 | grep '\(^\|:\)\(@<:@^/@:>@\|$\)' > /dev/null); then
AC_MSG_ERROR([--with-tzpath must contain only absolute paths, not $1])
return 1;
fi
Expand Down