traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #17603: Merge configure.ac fix from 3.5

This commit is contained in:
Martin Panter 2016-03-18 03:03:10 +00:00
parent b3bf448426 d887d1f365
commit 499d3654a8
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -846,6 +846,9 @@ Tests
Build 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 - Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by
Bjoern Thiel. Bjoern Thiel.

10
configure vendored
View File

@ -12869,19 +12869,9 @@ cat >>confdefs.h <<_ACEOF
_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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
$as_echo_n "checking for time.h that defines altzone... " >&6; } $as_echo_n "checking for time.h that defines altzone... " >&6; }
if ${ac_cv_header_time_altzone+:} false; then : if ${ac_cv_header_time_altzone+:} false; then :

2
configure.ac
View File

@ -3727,7 +3727,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CHECK_MEMBERS([struct stat.st_flags]) AC_CHECK_MEMBERS([struct stat.st_flags])
AC_CHECK_MEMBERS([struct stat.st_gen]) AC_CHECK_MEMBERS([struct stat.st_gen])
AC_CHECK_MEMBERS([struct stat.st_birthtime]) 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_MSG_CHECKING(for time.h that defines altzone)
AC_CACHE_VAL(ac_cv_header_time_altzone,[ AC_CACHE_VAL(ac_cv_header_time_altzone,[

4
pyconfig.h.in
View File

@ -934,10 +934,6 @@
/* Define to 1 if `tm_zone' is a member of `struct tm'. */ /* Define to 1 if `tm_zone' is a member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE #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. */ /* Define if you have the 'symlink' function. */
#undef HAVE_SYMLINK #undef HAVE_SYMLINK