diff options
| author | Paul Ganssle <paul@ganssle.io> | 2021-01-12 18:17:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 18:17:52 (GMT) |
| commit | 0f66498fd8ee8644be6df963b86a1523f6069ddd (patch) | |
| tree | eabd48e262e7ffd165e7e49aa3e27c233b988594 | |
| parent | 4db8988420e0a122d617df741381b0c385af032c (diff) | |
| download | cpython-0f66498fd8ee8644be6df963b86a1523f6069ddd.zip cpython-0f66498fd8ee8644be6df963b86a1523f6069ddd.tar.gz cpython-0f66498fd8ee8644be6df963b86a1523f6069ddd.tar.bz2 | |
bpo-42874: Remove grep -qE options for Solaris 10 compatibility (GH-24200)
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]():
| -rw-r--r-- | Misc/NEWS.d/next/Build/2021-01-12-10-06-50.bpo-42874.XKK61g.rst | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Build/2021-01-12-10-06-50.bpo-42874.XKK61g.rst b/Misc/NEWS.d/next/Build/2021-01-12-10-06-50.bpo-42874.XKK61g.rst new file mode 100644 index 0000000..c3ef7b3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-01-12-10-06-50.bpo-42874.XKK61g.rst @@ -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). @@ -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 diff --git a/configure.ac b/configure.ac index 990d6bf..08c462a 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |