https://github.com/python/cpython/commit/142104ce78a8717f99eb42ce030eb29775dd550c
commit: 142104ce78a8717f99eb42ce030eb29775dd550c
branch: main
author: Hood Chatham <roberthoodchat...@gmail.com>
committer: erlend-aasland <erlend.aasl...@protonmail.com>
date: 2024-11-13T21:57:33+01:00
summary:
gh-89640: Pull in update to float word order detection in autoconf-archive
(#126747)
files:
M .github/workflows/build.yml
M Tools/build/regen-configure.sh
M aclocal.m4
M configure
M configure.ac
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b769bba72816d6..c854c13e12f922 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
runs-on: ubuntu-24.04
container:
- image: ghcr.io/python/autoconf:2024.10.16.11360930377
+ image: ghcr.io/python/autoconf:2024.11.11.11786316759
timeout-minutes: 60
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
diff --git a/Tools/build/regen-configure.sh b/Tools/build/regen-configure.sh
index e1ecefddeb8732..d2a613b1e40dc1 100755
--- a/Tools/build/regen-configure.sh
+++ b/Tools/build/regen-configure.sh
@@ -5,7 +5,7 @@ set -e -x
# The check_autoconf_regen job of .github/workflows/build.yml must kept in
# sync with this script. Use the same container image than the job so the job
# doesn't need to run autoreconf in a container.
-IMAGE="ghcr.io/python/autoconf:2024.10.16.11360930377"
+IMAGE="ghcr.io/python/autoconf:2024.11.11.11786316759"
AUTORECONF="autoreconf -ivf -Werror"
WORK_DIR="/src"
diff --git a/aclocal.m4 b/aclocal.m4
index b082a5b1bc5e07..920c2b38560faa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -91,7 +91,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS],
[m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 12
+#serial 14
AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
[AC_CACHE_CHECK(whether float word ordering is bigendian,
@@ -112,10 +112,10 @@ int main (int argc, char *argv[])
]])], [
-if grep noonsees conftest$EXEEXT >/dev/null ; then
+if grep noonsees conftest* > /dev/null ; then
ax_cv_c_float_words_bigendian=yes
fi
-if grep seesnoon conftest$EXEEXT >/dev/null ; then
+if grep seesnoon conftest* >/dev/null ; then
if test "$ax_cv_c_float_words_bigendian" = unknown; then
ax_cv_c_float_words_bigendian=no
else
@@ -398,7 +398,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
AC_SUBST([OPENSSL_LDFLAGS])
])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
# serial 12 (pkg-config-0.29.2)
dnl Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
@@ -486,7 +486,7 @@ dnl Check to see whether a particular set of modules
exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
@@ -555,14 +555,14 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- m4_default([$4], [AC_MSG_ERROR(
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -574,7 +574,7 @@ _PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -584,10 +584,10 @@ _PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- $3
+ $3
fi[]dnl
])dnl PKG_CHECK_MODULES
@@ -674,6 +674,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+ [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+ [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+ [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+ [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+ [auto],[PKG_CHECK_MODULES([$1],[$2],
+ [m4_n([def_action_if_found]) $3],
+ [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
+
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2021 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 7a9d9627e50dfc..b1ced3106618ba 100755
--- a/configure
+++ b/configure
@@ -13717,12 +13717,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBUUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "uuid >= 2.20" 2>&1`
+ LIBUUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "uuid >= 2.20" 2>&1`
else
- LIBUUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"uuid >= 2.20" 2>&1`
+ LIBUUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"uuid >= 2.20" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBUUID_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBUUID_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -13974,11 +13974,11 @@ LIBS=$save_LIBS
else
- LIBUUID_CFLAGS=$pkg_cv_LIBUUID_CFLAGS
- LIBUUID_LIBS=$pkg_cv_LIBUUID_LIBS
+ LIBUUID_CFLAGS=$pkg_cv_LIBUUID_CFLAGS
+ LIBUUID_LIBS=$pkg_cv_LIBUUID_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- have_uuid=yes
+ have_uuid=yes
printf "%s\n" "#define HAVE_UUID_H 1" >>confdefs.h
printf "%s\n" "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
@@ -14666,12 +14666,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libffi" 2>&1`
+ LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libffi" 2>&1`
else
- LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libffi" 2>&1`
+ LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libffi" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBFFI_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBFFI_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -14817,11 +14817,11 @@ LIBS=$save_LIBS
else
- LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
- LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
+ LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
+ LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- have_libffi=yes
+ have_libffi=yes
fi
fi
@@ -15143,25 +15143,25 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBMPDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libmpdec >= 2.5.0" 2>&1`
+ LIBMPDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libmpdec >= 2.5.0" 2>&1`
else
- LIBMPDEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libmpdec >= 2.5.0" 2>&1`
+ LIBMPDEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "libmpdec >= 2.5.0" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBMPDEC_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBMPDEC_PKG_ERRORS" >&5
- LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
+ LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
LIBMPDEC_LIBS=${LIBMPDEC_LIBS-"-lmpdec -lm"}
LIBMPDEC_INTERNAL=
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
+ LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
LIBMPDEC_LIBS=${LIBMPDEC_LIBS-"-lmpdec -lm"}
LIBMPDEC_INTERNAL=
else
- LIBMPDEC_CFLAGS=$pkg_cv_LIBMPDEC_CFLAGS
- LIBMPDEC_LIBS=$pkg_cv_LIBMPDEC_LIBS
+ LIBMPDEC_CFLAGS=$pkg_cv_LIBMPDEC_CFLAGS
+ LIBMPDEC_LIBS=$pkg_cv_LIBMPDEC_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -15412,12 +15412,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "sqlite3 >= 3.15.2" 2>&1`
+ LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "sqlite3 >= 3.15.2" 2>&1`
else
- LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "sqlite3 >= 3.15.2" 2>&1`
+ LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "sqlite3 >= 3.15.2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSQLITE3_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSQLITE3_PKG_ERRORS" >&5
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS-""}
@@ -15433,8 +15433,8 @@ printf "%s\n" "no" >&6; }
else
- LIBSQLITE3_CFLAGS=$pkg_cv_LIBSQLITE3_CFLAGS
- LIBSQLITE3_LIBS=$pkg_cv_LIBSQLITE3_LIBS
+ LIBSQLITE3_CFLAGS=$pkg_cv_LIBSQLITE3_CFLAGS
+ LIBSQLITE3_LIBS=$pkg_cv_LIBSQLITE3_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -16176,24 +16176,24 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TCLTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$_QUERY" 2>&1`
+ TCLTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$_QUERY" 2>&1`
else
- TCLTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$_QUERY" 2>&1`
+ TCLTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$_QUERY" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$TCLTK_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$TCLTK_PKG_ERRORS" >&5
- found_tcltk=no
+ found_tcltk=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- found_tcltk=no
+ found_tcltk=no
else
- TCLTK_CFLAGS=$pkg_cv_TCLTK_CFLAGS
- TCLTK_LIBS=$pkg_cv_TCLTK_LIBS
+ TCLTK_CFLAGS=$pkg_cv_TCLTK_CFLAGS
+ TCLTK_LIBS=$pkg_cv_TCLTK_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- found_tcltk=yes
+ found_tcltk=yes
fi
fi
@@ -16273,14 +16273,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "x11" 2>&1`
+ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "x11" 2>&1`
else
- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"x11" 2>&1`
+ X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"x11" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$X11_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$X11_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (x11) were not met:
+ as_fn_error $? "Package requirements (x11) were not met:
$X11_PKG_ERRORS
@@ -16293,7 +16293,7 @@ See the pkg-config man page for more details."
"$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':"
>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':"
>&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make
sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -16306,8 +16306,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- X11_CFLAGS=$pkg_cv_X11_CFLAGS
- X11_LIBS=$pkg_cv_X11_LIBS
+ X11_CFLAGS=$pkg_cv_X11_CFLAGS
+ X11_LIBS=$pkg_cv_X11_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -20712,12 +20712,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "zlib >= 1.2.0" 2>&1`
+ ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "zlib >= 1.2.0" 2>&1`
else
- ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"zlib >= 1.2.0" 2>&1`
+ ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"zlib >= 1.2.0" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$ZLIB_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$ZLIB_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -20975,8 +20975,8 @@ LIBS=$save_LIBS
else
- ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
- ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
+ ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
+ ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -21060,12 +21060,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BZIP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "bzip2" 2>&1`
+ BZIP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "bzip2" 2>&1`
else
- BZIP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"bzip2" 2>&1`
+ BZIP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"bzip2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$BZIP2_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$BZIP2_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -21229,11 +21229,11 @@ LIBS=$save_LIBS
else
- BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS
- BZIP2_LIBS=$pkg_cv_BZIP2_LIBS
+ BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS
+ BZIP2_LIBS=$pkg_cv_BZIP2_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- have_bzip2=yes
+ have_bzip2=yes
fi
@@ -21288,12 +21288,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBLZMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "liblzma" 2>&1`
+ LIBLZMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "liblzma" 2>&1`
else
- LIBLZMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"liblzma" 2>&1`
+ LIBLZMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"liblzma" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBLZMA_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBLZMA_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -21457,11 +21457,11 @@ LIBS=$save_LIBS
else
- LIBLZMA_CFLAGS=$pkg_cv_LIBLZMA_CFLAGS
- LIBLZMA_LIBS=$pkg_cv_LIBLZMA_LIBS
+ LIBLZMA_CFLAGS=$pkg_cv_LIBLZMA_CFLAGS
+ LIBLZMA_LIBS=$pkg_cv_LIBLZMA_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- have_liblzma=yes
+ have_liblzma=yes
fi
@@ -24174,10 +24174,10 @@ if ac_fn_c_try_link "$LINENO"
then :
-if grep noonsees conftest$EXEEXT >/dev/null ; then
+if grep noonsees conftest* > /dev/null ; then
ax_cv_c_float_words_bigendian=yes
fi
-if grep seesnoon conftest$EXEEXT >/dev/null ; then
+if grep seesnoon conftest* >/dev/null ; then
if test "$ax_cv_c_float_words_bigendian" = unknown; then
ax_cv_c_float_words_bigendian=no
else
@@ -24213,10 +24213,6 @@ printf "%s\n" "#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
1" >>confdefs.h
# but if it's not big or little, then it must be this?
printf "%s\n" "#define DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 1" >>confdefs.h
- ;; #(
- wasm*) :
-
-printf "%s\n" "#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1" >>confdefs.h
;; #(
*) :
as_fn_error $? "Unknown float word ordering. You need to manually preset
ax_cv_c_float_words_bigendian=no (or yes) according to your system." "$LINENO"
5 ;;
@@ -25296,12 +25292,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBREADLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "readline" 2>&1`
+ LIBREADLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "readline" 2>&1`
else
- LIBREADLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "readline" 2>&1`
+ LIBREADLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "readline" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBREADLINE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBREADLINE_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -25459,8 +25455,8 @@ LIBS=$save_LIBS
else
- LIBREADLINE_CFLAGS=$pkg_cv_LIBREADLINE_CFLAGS
- LIBREADLINE_LIBS=$pkg_cv_LIBREADLINE_LIBS
+ LIBREADLINE_CFLAGS=$pkg_cv_LIBREADLINE_CFLAGS
+ LIBREADLINE_LIBS=$pkg_cv_LIBREADLINE_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -25527,12 +25523,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libedit" 2>&1`
+ LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libedit" 2>&1`
else
- LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libedit" 2>&1`
+ LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libedit" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBEDIT_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBEDIT_PKG_ERRORS" >&5
save_CFLAGS=$CFLAGS
@@ -25694,8 +25690,8 @@ LIBS=$save_LIBS
else
- LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
- LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
+ LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
+ LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -26556,21 +26552,21 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "ncursesw" 2>&1`
+ CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "ncursesw" 2>&1`
else
- CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"ncursesw" 2>&1`
+ CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"ncursesw" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$CURSES_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CURSES_PKG_ERRORS" >&5
- have_curses=no
+ have_curses=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- have_curses=no
+ have_curses=no
else
- CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
- CURSES_LIBS=$pkg_cv_CURSES_LIBS
+ CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
+ CURSES_LIBS=$pkg_cv_CURSES_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -26629,21 +26625,21 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "panelw" 2>&1`
+ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "panelw" 2>&1`
else
- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"panelw" 2>&1`
+ PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"panelw" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$PANEL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$PANEL_PKG_ERRORS" >&5
- have_panel=no
+ have_panel=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- have_panel=no
+ have_panel=no
else
- PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
- PANEL_LIBS=$pkg_cv_PANEL_LIBS
+ PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
+ PANEL_LIBS=$pkg_cv_PANEL_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -26710,21 +26706,21 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "ncurses" 2>&1`
+ CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "ncurses" 2>&1`
else
- CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"ncurses" 2>&1`
+ CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"ncurses" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$CURSES_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CURSES_PKG_ERRORS" >&5
- have_curses=no
+ have_curses=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- have_curses=no
+ have_curses=no
else
- CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
- CURSES_LIBS=$pkg_cv_CURSES_LIBS
+ CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
+ CURSES_LIBS=$pkg_cv_CURSES_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -26783,21 +26779,21 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "panel" 2>&1`
+ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "panel" 2>&1`
else
- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"panel" 2>&1`
+ PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"panel" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$PANEL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$PANEL_PKG_ERRORS" >&5
- have_panel=no
+ have_panel=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- have_panel=no
+ have_panel=no
else
- PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
- PANEL_LIBS=$pkg_cv_PANEL_LIBS
+ PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
+ PANEL_LIBS=$pkg_cv_PANEL_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
diff --git a/configure.ac b/configure.ac
index bc3d2d0e63b77a..3a55cbc1320393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5918,9 +5918,6 @@ AX_C_FLOAT_WORDS_BIGENDIAN(
AC_DEFINE([DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754], [1],
[Define if C doubles are 64-bit IEEE 754 binary
format,
stored in ARM mixed-endian order (byte order
45670123)])],
- [wasm*], [AC_DEFINE([DOUBLE_IS_LITTLE_ENDIAN_IEEE754], [1],
- [Define if C doubles are 64-bit IEEE 754 binary
format,
- stored with the least significant byte
first])],
[AC_MSG_ERROR([m4_normalize([
Unknown float word ordering. You need to manually
preset ax_cv_c_float_words_bigendian=no (or yes)
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
