[Python-checkins] bpo-38527: fix configure script for Solaris (GH-16845)
Arnon Yaari
webhook-mailer at python.org
Wed Apr 1 11:19:18 EDT 2020
https://github.com/python/cpython/commit/5dd836030e0e399b21ab0865ae0d93934bdb3930
commit: 5dd836030e0e399b21ab0865ae0d93934bdb3930
branch: master
author: Arnon Yaari <wiggin15 at yahoo.com>
committer: GitHub <noreply at github.com>
date: 2020-04-01T08:19:09-07:00
summary:
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
files:
A Misc/NEWS.d/next/Build/2020-03-28-10-43-09.bpo-38527.fqCRgD.rst
M configure
M m4/ax_c_float_words_bigendian.m4
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 0000000000000..869693095e49a
--- /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 893d0e1414917..a7a3ac254a970 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 216b90d803187..746228c2c98df 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
More information about the Python-checkins
mailing list