From 96f0b001a039e1281de8deefb0ad7360f09b0c81 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 30 May 2002 13:15:44 -0500 Subject: [svn-r5488] Purpose: Bug Fix Description: On Linux 2.4 kernel, we need to check for Linux LFS support. There was a failure in the Fortran code when we tried to pass a 4 byte off_t variable to a function which expected an 8 byte off_t. This is due to there being no check for the LFS support in the Fortran code. Solution: Added the check for Linux LFS support. Platforms tested: Elena will test on Linux platform... --- fortran/configure | 123 +++++++++++++++++++++++++++++++++++++++++++++++++-- fortran/configure.in | 48 ++++++++++++++++++++ 2 files changed, 167 insertions(+), 4 deletions(-) diff --git a/fortran/configure b/fortran/configure index 231dbc0..b977abb 100755 --- a/fortran/configure +++ b/fortran/configure @@ -995,6 +995,8 @@ Optional Features: --enable-fast-install=PKGS optimize for fast installation default=yes --disable-libtool-lock avoid locking (might break parallel builds) --enable-static-exec Build only statically linked executables default=no + --enable-linux-lfs Enable support for large (64-bit) files on Linux. + [default=check] --enable-parallel=TYPE Search for MPI-IO and MPI support files Optional Packages: @@ -3876,7 +3878,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3879 "configure"' > conftest.$ac_ext + echo '#line 3881 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4417,7 +4419,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6228,7 +6230,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + LINUX_LFS=yes +fi +done + + ;; + esac + + echo "$as_me:$LINENO: checking for large file support on linux mode" >&5 +echo $ECHO_N "checking for large file support on linux mode... $ECHO_C" >&6 + if test "X$LINUX_LFS" = "Xyes"; then + echo "$as_me:$LINENO: result: enabled" >&5 +echo "${ECHO_T}enabled" >&6 + CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $CPPFLAGS" + else + echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6 + fi + + CPPFLAGS="-D_POSIX_SOURCE $CPPFLAGS" + + CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS" + ;; +esac + for ac_prog in f90 pgf90 xlf90 f95 g95 xlf95 do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/fortran/configure.in b/fortran/configure.in index d15b53e..aa277da 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -271,6 +271,54 @@ else fi AC_SUBST(LT_STATIC_EXEC) +case "$host_cpu-$host_vendor-$host_os" in + *linux*) + dnl ---------------------------------------------------------------------- + dnl Enable large file support on linux? Store the result in the LINUX_LFS + dnl variable for posterity + AC_ARG_ENABLE(linux-lfs, + [AC_HELP_STRING([--enable-linux-lfs], + [Enable support for large (64-bit) + files on Linux. [default=check]])]) + + case "X-$enable_linux_lfs" in + X-yes) + LINUX_LFS=yes + ;; + X-no) + LINUX_LFS=no + ;; + X-|*) + LINUX_LFS=no + AC_CHECK_FUNCS([getdents64], + dnl Add the large file support flags to the CPPFLAGS macro if + dnl we're on a Linux system which austensibly supports LFS. (We + dnl think it does if it has the `getdents64' syscall). + [LINUX_LFS=yes]) + ;; + esac + + AC_MSG_CHECKING([for large file support on linux mode]) + if test "X$LINUX_LFS" = "Xyes"; then + AC_MSG_RESULT([enabled]) + CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $CPPFLAGS" + else + AC_MSG_RESULT([disabled]) + fi + + dnl Add POSIX support on Linux systems, so defines + dnl __USE_POSIX, which is required to get the prototype for fdopen + dnl defined correctly in + CPPFLAGS="-D_POSIX_SOURCE $CPPFLAGS" + + dnl Also add BSD support on Linux systems, so defines + dnl __USE_BSD, which is required to get the prototype for strdup + dnl defined correctly in and snprintf & vsnprintf defined + dnl correctly in + CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS" + ;; +esac + dnl ---------------------------------------------------------------------- dnl Check for a Fortran 9X compiler, how to optimize it, and how to dnl include modules. -- cgit v0.12