diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-04-01 15:38:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 15:38:17 (GMT) |
| commit | fc036409226d2c65dad9503854f09b9a39c84f14 (patch) | |
| tree | 418d6f9b0fc69929fa42d0dca9f350debef45537 | |
| parent | f971c8c0a0fbe1959843179e2811b047001125a0 (diff) | |
| download | cpython-fc036409226d2c65dad9503854f09b9a39c84f14.zip cpython-fc036409226d2c65dad9503854f09b9a39c84f14.tar.gz cpython-fc036409226d2c65dad9503854f09b9a39c84f14.tar.bz2 | |
bpo-38527: fix configure script for Solaris (GH-16845)
On Solaris, the regular "grep" command may be an old version that fails to search a binary file. We need to use the correct command (ggrep, in our case), which is found by the configure script earlier.
Automerge-Triggered-By: @pablogsal
(cherry picked from commit 5dd836030e0e399b21ab0865ae0d93934bdb3930)
Co-authored-by: Arnon Yaari <wiggin15@yahoo.com>
| -rw-r--r-- | Misc/NEWS.d/next/Build/2020-03-28-10-43-09.bpo-38527.fqCRgD.rst | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | m4/ax_c_float_words_bigendian.m4 | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Build/2020-03-28-10-43-09.bpo-38527.fqCRgD.rst b/Misc/NEWS.d/next/Build/2020-03-28-10-43-09.bpo-38527.fqCRgD.rst new file mode 100644 index 0000000..8696930 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-03-28-10-43-09.bpo-38527.fqCRgD.rst @@ -0,0 +1,2 @@ +Fix configure check on Solaris for "float word ordering": sometimes, the correct "grep" command was not being used. +Patch by Arnon Yaari. @@ -14303,10 +14303,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : -if grep noonsees conftest.$ac_objext >/dev/null ; then +if $GREP noonsees conftest.$ac_objext >/dev/null ; then ax_cv_c_float_words_bigendian=yes fi -if grep seesnoon conftest.$ac_objext >/dev/null ; then +if $GREP seesnoon conftest.$ac_objext >/dev/null ; then if test "$ax_cv_c_float_words_bigendian" = unknown; then ax_cv_c_float_words_bigendian=no else diff --git a/m4/ax_c_float_words_bigendian.m4 b/m4/ax_c_float_words_bigendian.m4 index 216b90d..746228c 100644 --- a/m4/ax_c_float_words_bigendian.m4 +++ b/m4/ax_c_float_words_bigendian.m4 @@ -49,10 +49,10 @@ double d = 909042349670368103374704789055050114762116927356156320147971208440534 ]])], [ -if grep noonsees conftest.$ac_objext >/dev/null ; then +if $GREP noonsees conftest.$ac_objext >/dev/null ; then ax_cv_c_float_words_bigendian=yes fi -if grep seesnoon conftest.$ac_objext >/dev/null ; then +if $GREP seesnoon conftest.$ac_objext >/dev/null ; then if test "$ax_cv_c_float_words_bigendian" = unknown; then ax_cv_c_float_words_bigendian=no else |