aa78456748
* Update to version 1.12.3. * Drop upstreamed patches: Remove-duplicate-code.patch, H5O__pline_decode-Make-more-resilient-to-out-of-bounds-read.patch, H5O_dtype_decode_helper-Parent-of-enum-needs-to-have-same-size-as-enum-itself.patch, Pass-compact-chunk-size-info-to-ensure-requested-elements-are-within-bounds.patch, Make-sure-info-block-for-external-links-has-at-least-3-bytes.patch, Compound-datatypes-may-not-have-members-of-size-0.patch, H5IMget_image_info-H5Sget_simple_extent_dims-does-not-exceed-array-size.patch, Check-for-overflow-when-calculating-on-disk-attribute-data-size-2459.patch * New BuildRequires: hostname. * Work around an sed hack in upstream configure file by dropping "-Werror=return-type" from RPM %optflags. OBS-URL: https://build.opensuse.org/request/show/1173662 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=174
113 lines
4.6 KiB
Diff
113 lines
4.6 KiB
Diff
Index: hdf5-1.12.3/bin/h5cc.in
|
|
===================================================================
|
|
--- hdf5-1.12.3.orig/bin/h5cc.in
|
|
+++ hdf5-1.12.3/bin/h5cc.in
|
|
@@ -88,10 +88,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}"
|
|
@@ -104,7 +104,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@"
|
|
+# openSUSE prefers shared libraries
|
|
+STATIC_AVAILABLE=no
|
|
if test "${STATIC_AVAILABLE}" = "yes"; then
|
|
USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
|
|
else
|
|
@@ -384,7 +385,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
|
|
|
|
Index: hdf5-1.12.3/c++/src/h5c++.in
|
|
===================================================================
|
|
--- hdf5-1.12.3.orig/c++/src/h5c++.in
|
|
+++ hdf5-1.12.3/c++/src/h5c++.in
|
|
@@ -86,10 +86,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_CXXLINKER:-$CXXLINKERBASE}"
|
|
@@ -102,7 +102,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@"
|
|
+# openSUSE prefers shared libraries
|
|
+STATIC_AVAILABLE=no
|
|
if test "${STATIC_AVAILABLE}" = "yes"; then
|
|
USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
|
|
else
|
|
@@ -384,7 +385,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
|
|
Index: hdf5-1.12.3/fortran/src/h5fc.in
|
|
===================================================================
|
|
--- hdf5-1.12.3.orig/fortran/src/h5fc.in
|
|
+++ hdf5-1.12.3/fortran/src/h5fc.in
|
|
@@ -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@"
|
|
+# openSUSE 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
|
|
|