[Python-checkins] CVS: python/dist/src acconfig.h,1.54,1.55 configure,1.247,1.248 configure.in,1.255,1.256 pyconfig.h.in,1.9,1.10

Guido van Rossum gvanrossum@users.sourceforge.net
Sun, 09 Sep 2001 16:51:41 -0700 

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv26692

Modified Files:
	acconfig.h configure configure.in pyconfig.h.in 
Log Message:
This time (I hope) I've fixed largefile
support on Linux (and Solaris, I expect) for real.
The necessary symbols are defined once and for all,
under the assumption that they won't harm elsewhere.

Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** acconfig.h	2001/09/06 08:16:17	1.54
--- acconfig.h	2001/09/09 23:51:39	1.55
***************
*** 75,81 ****
     and long long is available and at least as big as an off_t. You may need
     to add some flags for configuration and compilation to enable this mode.
!    E.g, for Solaris 2.7:
!    CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" OPT="-O2 $CFLAGS" \
! 	configure
  */
  #undef HAVE_LARGEFILE_SUPPORT
--- 75,79 ----
     and long long is available and at least as big as an off_t. You may need
     to add some flags for configuration and compilation to enable this mode.
!    (For Solaris and Linux, the necessary defines are already defined.)
  */
  #undef HAVE_LARGEFILE_SUPPORT

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.247
retrieving revision 1.248
diff -C2 -d -r1.247 -r1.248
*** configure	2001/09/07 14:25:12	1.247
--- configure	2001/09/09 23:51:39	1.248
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.254 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.255 
  
[...3825 lines suppressed...]
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7069 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7168,7172 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7171: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 7115,7119 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7118: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.255
retrieving revision 1.256
diff -C2 -d -r1.255 -r1.256
*** configure.in	2001/09/07 14:25:12	1.255
--- configure.in	2001/09/09 23:51:39	1.256
***************
*** 441,444 ****
--- 441,449 ----
  AC_MSG_RESULT($was_it_defined)
  
+ # Two defines needed to enable largefile support on various platforms
+ # These may affect some typedefs
+ AC_DEFINE(_LARGEFILE_SOURCE)
+ AC_DEFINE(_FILE_OFFSET_BITS, 64)
+ 
  # Add some code to confdefs.h so that the test for off_t works on SCO
  cat >> confdefs.h <<\EOF
***************
*** 1276,1320 ****
  AC_CHECK_FUNCS(openpty,, AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"]))
  AC_CHECK_FUNCS(forkpty,, AC_CHECK_LIB(util,forkpty, [AC_DEFINE(HAVE_FORKPTY)] [LIBS="$LIBS -lutil"]))
- 
- # Try defining symbols to enable large file support.
- # The particular combination of symbols used here is known to work
- # on Linux and Solaris [2.]7.
- AC_MSG_CHECKING(for CFLAGS to enable large files)
- OLD_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <stdio.h>
- main() {
- 	FILE *fp;
- 	off_t seek = 0x80000000ul;
- 	off_t tell = 0;
- 	fp = fopen("conftestval", "wb");
- 	if (fp == NULL) {
- 		perror("conftestval");
- 		exit(1);
- 	}
-  	if (fseeko(fp, seek, 0) < 0)
- 		perror("fseeko");
- 	else
- 		tell = ftello(fp);
- 	fclose(fp);
- 	unlink("conftestval");
- 	if (tell == seek) {
- 		fprintf(stderr, "seek to 2**31 worked\n");
- 		exit(0);
- 	}
- 	else {
- 		exit(1);
- 		fprintf(stderr, "seek to 2**31 didn't work\n");
- 	}
- }
- ],
- AC_MSG_RESULT(yes)
- AC_DEFINE(_LARGEFILE_SOURCE)
- AC_DEFINE(_FILE_OFFSET_BITS,64),
- AC_MSG_RESULT(no),
- AC_MSG_RESULT(no (cross-compiling)))
- CFLAGS="$OLD_CFLAGS"
  
  # check for long file support functions
--- 1281,1284 ----

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pyconfig.h.in	2001/09/06 08:16:17	1.9
--- pyconfig.h.in	2001/09/09 23:51:39	1.10
***************
*** 137,143 ****
     and long long is available and at least as big as an off_t. You may need
     to add some flags for configuration and compilation to enable this mode.
!    E.g, for Solaris 2.7:
!    CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" OPT="-O2 $CFLAGS" \
!  configure
  */
  #undef HAVE_LARGEFILE_SUPPORT
--- 137,141 ----
     and long long is available and at least as big as an off_t. You may need
     to add some flags for configuration and compilation to enable this mode.
!    (For Solaris and Linux, the necessary defines are already defined.)
  */
  #undef HAVE_LARGEFILE_SUPPORT