cpython: 628bd1ebfa22 (original) (raw)

Mercurial > cpython

changeset 100570:628bd1ebfa22

Issue #17603: Merge configure.ac fix from 3.5 [#17603]

Martin Panter vadmium+py@gmail.com
date	Fri, 18 Mar 2016 03:03:10 +0000
parents	8ed35225c2ec(current diff)0774398c3433(diff)
children	507eee5d3fee
files	Misc/NEWS configure configure.ac
diffstat	4 files changed, 5 insertions(+), 16 deletions(-)[+] [-] Misc/NEWS 3 configure 12 configure.ac 2 pyconfig.h.in 4

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -846,6 +846,9 @@ Tests 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.

--- a/configure +++ b/configure @@ -12869,17 +12869,7 @@ cat >>confdefs.h <<_ACEOF _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 { asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5

--- a/configure.ac +++ b/configure.ac @@ -3727,7 +3727,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize 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,[

--- 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