mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 03:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-42874: Remove grep -qE options for Solaris 10 compatibility (GH-24200)

Browse source 
According to [bpo-42874](), some versions of grep do not support the `-q` and `-E` options. Although both options are used elsewhere in the configure script, this particular bit of validation can be achieved without them,
so there's no real harm in using a grep call with no flags.

Would be good to get some people taking advantage of the `--with-tzpath` arguments in the wild to try this out.. Local testing seems to indicate that this does the same thing, but I don't know that we have any buildbots using this option. Maybe @pablogsal?

[bpo-42874]():
This commit is contained in:
Paul Ganssle 2021-01-12 13:17:52 -05:00 • committed by GitHub
parent 4db8988420
commit 0f66498fd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS.d/next/Build/2021-01-12-10-06-50.bpo-42874.XKK61g.rst Normal file
View file

@ -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
configure vendored
View file

@ -10252,7 +10252,7 @@ validate_tzpath() {
fi fi
# Bad paths are those that don't start with / # 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 as_fn_error $? "--with-tzpath must contain only absolute paths, not $1" "$LINENO" 5
return 1; return 1;
fi fi

2
configure.ac
View file

@ -2980,7 +2980,7 @@ validate_tzpath() {
# Bad paths are those that don't start with / # Bad paths are those that don't start with /
dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output 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]) AC_MSG_ERROR([--with-tzpath must contain only absolute paths, not $1])
return 1; return 1;
fi fi