mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r26347] Moves large file and POSIX/GNU defines from AM_CPPFLAGS to H5_CPPFLAGS,

Browse Source 
which is where the rest of the #defines reside.

The key difference is that AM_CPPFLAGS is exported to h5cc. These #defines
are not necessary to consume the HDF5 API and it's bad form to inflict
our build configuration on users. In particular, the GNU/POSIX defines
could easily conflict with a user's.

Fixes: HDFFV-9152

Tested on: h5committest
This commit is contained in:
Dana Robinson 2015-03-03 17:27:21 -05:00
parent 6c7aa17753
commit f56cb6a8f0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acsite.m4
View File

@ -48,7 +48,7 @@ done])
case $$3 in #(
no | unknown) ;;
*) AC_DEFINE_UNQUOTED([$1], [$$3], [$4])
AM_CPPFLAGS="-D$1=$$3 $AM_CPPFLAGS";;
H5_CPPFLAGS="-D$1=$$3 $H5_CPPFLAGS";;
esac
rm -rf conftest*[]dnl
])# _AC_SYS_LARGEFILE_MACRO_VALUE

10
configure vendored
View File

@ -22806,7 +22806,7 @@ cat >>confdefs.h <<_ACEOF
#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
_ACEOF
AM_CPPFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits $AM_CPPFLAGS";;
H5_CPPFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits $H5_CPPFLAGS";;
esac
rm -rf conftest*
@ -22894,7 +22894,7 @@ cat >>confdefs.h <<_ACEOF
#define _LARGE_FILES $ac_cv_sys_large_files
_ACEOF
AM_CPPFLAGS="-D_LARGE_FILES=$ac_cv_sys_large_files $AM_CPPFLAGS";;
H5_CPPFLAGS="-D_LARGE_FILES=$ac_cv_sys_large_files $H5_CPPFLAGS";;
esac
rm -rf conftest*
fi
@ -22906,7 +22906,7 @@ case "$host_cpu-$host_vendor-$host_os" in
*linux*)
## Make available various LFS-related routines using the following
## _LARGEFILE*_SOURCE macros.
AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
H5_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $H5_CPPFLAGS"
## Add POSIX support on Linux systems, so <features.h> defines
## __USE_POSIX, which is required to get the prototype for fdopen
@ -22932,7 +22932,7 @@ case "$host_cpu-$host_vendor-$host_os" in
## Need to add this so that O_DIRECT is visible for the direct
## VFD on Linux systems.
AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS"
H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS"
## Also add BSD support on Linux systems, so <features.h> defines
## __USE_BSD, which is required to get the prototype for strdup
@ -22942,7 +22942,7 @@ case "$host_cpu-$host_vendor-$host_os" in
## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
## however, we do not do this since it breaks the big test on some
## older platforms.
AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
H5_CPPFLAGS="-D_BSD_SOURCE $H5_CPPFLAGS"
;;
esac

6
configure.ac
View File

@ -1095,7 +1095,7 @@ case "$host_cpu-$host_vendor-$host_os" in
*linux*)
## Make available various LFS-related routines using the following
## _LARGEFILE*_SOURCE macros.
AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
H5_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $H5_CPPFLAGS"
## Add POSIX support on Linux systems, so <features.h> defines
## __USE_POSIX, which is required to get the prototype for fdopen
@ -1121,7 +1121,7 @@ case "$host_cpu-$host_vendor-$host_os" in
## Need to add this so that O_DIRECT is visible for the direct
## VFD on Linux systems.
AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS"
H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS"
## Also add BSD support on Linux systems, so <features.h> defines
## __USE_BSD, which is required to get the prototype for strdup
@ -1131,7 +1131,7 @@ case "$host_cpu-$host_vendor-$host_os" in
## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
## however, we do not do this since it breaks the big test on some
## older platforms.
AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
H5_CPPFLAGS="-D_BSD_SOURCE $H5_CPPFLAGS"
;;
esac