[Python-checkins] cpython (2.7): Issue #17603: Check for st_blocks field without requiring fileblocks.o

Wed Mar 16 23:08:00 EDT 2016

https://hg.python.org/cpython/rev/acbeb33dc76a
changeset: 100568:acbeb33dc76a
branch: 2.7
parent: 100531:1a40ee2bad6a
user: Martin Panter <vadmium+py at gmail.com>
date: Fri Mar 18 02:36:41 2016 +0000
summary:
 Issue #17603: Check for st_blocks field without requiring fileblocks.o
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
@@ -170,6 +170,9 @@
 Build
 -----
 
+- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
+ lower-level check for st_blocks in struct stat.
+
 - Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
 
 - Issue #24421: Compile Modules/_math.c once, before building extensions.
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -11962,17 +11962,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
@@ -3439,7 +3439,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
@@ -731,10 +731,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
