summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnon Yaari <wiggin15@yahoo.com>2020-04-01 15:19:09 (GMT)
committerGitHub <noreply@github.com>2020-04-01 15:19:09 (GMT)
commit5dd836030e0e399b21ab0865ae0d93934bdb3930 (patch)
tree91b5e7ff3d298832b6d97b32bad6fa9076137a50
parenteacc07439591c97f69ab4a3d17391b009cd78ae2 (diff)
downloadcpython-5dd836030e0e399b21ab0865ae0d93934bdb3930.zip
cpython-5dd836030e0e399b21ab0865ae0d93934bdb3930.tar.gz
cpython-5dd836030e0e399b21ab0865ae0d93934bdb3930.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
-rw-r--r--Misc/NEWS.d/next/Build/2020-03-28-10-43-09.bpo-38527.fqCRgD.rst2
-rwxr-xr-xconfigure4
-rw-r--r--m4/ax_c_float_words_bigendian.m44
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.
diff --git a/configure b/configure
index 893d0e1..a7a3ac2 100755
--- a/configure
+++ b/configure
@@ -14340,10 +14340,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