[Python-checkins] cpython (merge 3.5 -> default): Issue #17603: Merge configure.ac fix from 3.5
martin.panter
python-checkins at python.org
Wed Mar 16 23:08:00 EDT 2016
https://hg.python.org/cpython/rev/628bd1ebfa22
changeset: 100570:628bd1ebfa22
parent: 100567:8ed35225c2ec
parent: 100569:0774398c3433
user: Martin Panter <vadmium+py at gmail.com>
date: Fri Mar 18 03:03:10 2016 +0000
summary:
Issue #17603: Merge configure.ac fix from 3.5
files:
Misc/NEWS | 3 +++
configure | 12 +-----------
configure.ac | 2 +-
pyconfig.h.in | 4 ----
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -846,6 +846,9 @@
Build
-----
+- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
+ lower-level check for st_blocks in struct stat.
+
- Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by
Bjoern Thiel.
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -12869,17 +12869,7 @@
_ACEOF
-$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" fileblocks.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
- ;;
-esac
-
-fi
-
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3727,7 +3727,7 @@
AC_CHECK_MEMBERS([struct stat.st_flags])
AC_CHECK_MEMBERS([struct stat.st_gen])
AC_CHECK_MEMBERS([struct stat.st_birthtime])
-AC_STRUCT_ST_BLOCKS
+AC_CHECK_MEMBERS([struct stat.st_blocks])
AC_MSG_CHECKING(for time.h that defines altzone)
AC_CACHE_VAL(ac_cv_header_time_altzone,[
diff --git a/pyconfig.h.in b/pyconfig.h.in
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -934,10 +934,6 @@
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE
-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
-#undef HAVE_ST_BLOCKS
-
/* Define if you have the 'symlink' function. */
#undef HAVE_SYMLINK
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list