diff -up hdf5-1.10.7/bin/h5cc.in.wrappers hdf5-1.10.7/bin/h5cc.in --- hdf5-1.10.7/bin/h5cc.in.wrappers 2020-10-07 20:24:29.127283333 -0600 +++ hdf5-1.10.7/bin/h5cc.in 2020-10-07 20:27:05.289536904 -0600 @@ -89,10 +89,10 @@ CLINKERBASE="@CC@" # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in # from the hdf5 build. The order of the flags is intended to give precedence # to the user's flags. -H5BLD_CFLAGS="@AM_CFLAGS@ @CFLAGS@" +H5BLD_CFLAGS= H5BLD_CPPFLAGS="@AM_CPPFLAGS@ @CPPFLAGS@" -H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@" -H5BLD_LIBS="@LIBS@" +H5BLD_LDFLAGS= +H5BLD_LIBS= CC="${HDF5_CC:-$CCBASE}" CLINKER="${HDF5_CLINKER:-$CLINKERBASE}" @@ -105,7 +105,8 @@ LIBS="${HDF5_LIBS:-$LIBSBASE}" # available library is shared, it will be used by default. The user can # override either default, although choosing an unavailable library will result # in link errors. -STATIC_AVAILABLE="@enable_static@" +# Fedora prefers shared libraries +STATIC_AVAILABLE=no if test "${STATIC_AVAILABLE}" = "yes"; then USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}" else @@ -385,7 +386,7 @@ if test "x$do_link" = "xyes"; then # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in # from the hdf5 build. The order of the flags is intended to give precedence # to the user's flags. - $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link + $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args status=$? fi diff -up hdf5-1.10.7/c++/src/h5c++.in.wrappers hdf5-1.10.7/c++/src/h5c++.in --- hdf5-1.10.7/c++/src/h5c++.in.wrappers 2020-08-27 21:38:23.000000000 -0600 +++ hdf5-1.10.7/c++/src/h5c++.in 2020-10-07 20:24:29.126283325 -0600 @@ -87,10 +87,10 @@ CXXLINKERBASE="@CXX@" # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in # from the hdf5 build. The order of the flags is intended to give precedence # to the user's flags. -H5BLD_CXXFLAGS="@AM_CXXFLAGS@ @CXXFLAGS@" +H5BLD_CXXFLAGS= H5BLD_CPPFLAGS="@AM_CPPFLAGS@ @CPPFLAGS@" -H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@" -H5BLD_LIBS="@LIBS@" +H5BLD_LDFLAGS= +H5BLD_LIBS= CXX="${HDF5_CXX:-$CXXBASE}" CXXLINKER="${HDF5_CLINKER:-$CXXLINKERBASE}" @@ -103,7 +103,8 @@ LIBS="${HDF5_LIBS:-$LIBSBASE}" # available library is shared, it will be used by default. The user can # override either default, although choosing an unavailable library will result # in link errors. -STATIC_AVAILABLE="@enable_static@" +# Fedora prefers shared libraries +STATIC_AVAILABLE=no if test "${STATIC_AVAILABLE}" = "yes"; then USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}" else @@ -385,7 +386,7 @@ if test "x$do_link" = "xyes"; then # from the hdf5 build. The order of the flags is intended to give precedence # to the user's flags. - $SHOW $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link + $SHOW $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args status=$? fi diff -up hdf5-1.10.7/fortran/src/h5fc.in.wrappers hdf5-1.10.7/fortran/src/h5fc.in --- hdf5-1.10.7/fortran/src/h5fc.in.wrappers 2020-08-27 21:38:23.000000000 -0600 +++ hdf5-1.10.7/fortran/src/h5fc.in 2020-10-07 20:25:53.793962985 -0600 @@ -83,11 +83,11 @@ FLINKERBASE="@FC@" # libraries in $link_args, followed by any external library paths and libraries # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build. # The order of the flags is intended to give precedence to the user's flags. -H5BLD_FCFLAGS="@AM_FCFLAGS@ @FCFLAGS@" +H5BLD_FCFLAGS= F9XMODFLAG="@F9XMODFLAG@" F9XSUFFIXFLAG="@F9XSUFFIXFLAG@" -H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@" -H5BLD_LIBS="@LIBS@" +H5BLD_LDFLAGS=" +H5BLD_LIBS= FC="${HDF5_FC:-$FCBASE}" FLINKER="${HDF5_FLINKER:-$FLINKERBASE}" @@ -99,7 +99,8 @@ LIBS="${HDF5_LIBS:-$LIBSBASE}" # available library is shared, it will be used by default. The user can # override either default, although choosing an unavailable library will result # in link errors. -STATIC_AVAILABLE="@enable_static@" +# Fedora prefers shared libraries +STATIC_AVAILABLE=no if test "${STATIC_AVAILABLE}" = "yes"; then USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}" else @@ -363,7 +364,7 @@ if test "x$do_link" = "xyes"; then # libraries in $link_args, followed by any external library paths and libraries # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build. # The order of the flags is intended to give precedence to the user's flags. - $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link + $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args status=$? fi