Compare commits
10 Commits
40125daf3f
...
9fa9c4aef7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9fa9c4aef7 | ||
|
|
2a237de983 | ||
|
|
d2ae565d33 | ||
|
|
56fa53c1c5 | ||
|
|
09de2d5271 | ||
|
|
db8bb2e2ee | ||
|
|
d66b0fc324 | ||
|
|
366c0ae5be | ||
|
|
8a1026caec | ||
|
|
317a257d0e |
10
h5comp
Normal file
10
h5comp
Normal file
@ -0,0 +1,10 @@
|
||||
#!/bin/bash
|
||||
|
||||
ARCH=$(uname -m)
|
||||
|
||||
case $ARCH in
|
||||
x86_64 ) BITS=64;;
|
||||
* ) BITS=32;;
|
||||
esac
|
||||
|
||||
exec $0-${BITS} "$@"
|
||||
Binary file not shown.
BIN
hdf5-1.14.5.tar.gz
Normal file
BIN
hdf5-1.14.5.tar.gz
Normal file
Binary file not shown.
@ -1,20 +0,0 @@
|
||||
--- hdf5-1.12.0/src/Makefile.am~ 2020-02-29 00:29:58.000000000 +0100
|
||||
+++ hdf5-1.12.0/src/Makefile.am 2021-02-26 16:10:03.612252484 +0100
|
||||
@@ -156,8 +156,6 @@
|
||||
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
||||
# is set to ignore the error.
|
||||
H5Tinit.c: H5detect$(EXEEXT)
|
||||
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
||||
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
||||
$(RUNSERIAL) ./H5detect$(EXEEXT) $@ || \
|
||||
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
||||
($(RM) $@ ; exit 1)
|
||||
@@ -168,8 +166,6 @@
|
||||
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
||||
# is set to ignore the error.
|
||||
H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
|
||||
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
||||
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
||||
$(RUNSERIAL) ./H5make_libsettings$(EXEEXT) $@ || \
|
||||
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
||||
($(RM) $@ ; exit 1)
|
||||
145
hdf5-build.patch
145
hdf5-build.patch
@ -1,145 +0,0 @@
|
||||
diff --git a/java/examples/datasets/JavaDatasetExample.sh.in b/java/examples/datasets/JavaDatasetExample.sh.in
|
||||
index f29739a..fc9cddb 100644
|
||||
--- a/java/examples/datasets/JavaDatasetExample.sh.in
|
||||
+++ b/java/examples/datasets/JavaDatasetExample.sh.in
|
||||
@@ -39,7 +39,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
||||
BLDDIR="."
|
||||
BLDLIBDIR="$BLDDIR/testlibs"
|
||||
HDFTEST_HOME="$top_srcdir/java/examples/datasets"
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
+JARFILE=@PACKAGE_TARNAME@.jar
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@datasets.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
diff --git a/java/examples/datasets/Makefile.am b/java/examples/datasets/Makefile.am
|
||||
index 41a914b..195201a 100644
|
||||
--- a/java/examples/datasets/Makefile.am
|
||||
+++ b/java/examples/datasets/Makefile.am
|
||||
@@ -26,7 +26,7 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = examples/datasets
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)datasets.jar
|
||||
diff --git a/java/examples/datatypes/JavaDatatypeExample.sh.in b/java/examples/datatypes/JavaDatatypeExample.sh.in
|
||||
index e26d8c0..f6a9d87 100644
|
||||
--- a/java/examples/datatypes/JavaDatatypeExample.sh.in
|
||||
+++ b/java/examples/datatypes/JavaDatatypeExample.sh.in
|
||||
@@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
||||
BLDDIR="."
|
||||
BLDLIBDIR="$BLDDIR/testlibs"
|
||||
HDFTEST_HOME="$top_srcdir/java/examples/datatypes"
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
+JARFILE=@PACKAGE_TARNAME@.jar
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@datatypes.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
diff --git a/java/examples/datatypes/Makefile.am b/java/examples/datatypes/Makefile.am
|
||||
index 90790f7..450edef 100644
|
||||
--- a/java/examples/datatypes/Makefile.am
|
||||
+++ b/java/examples/datatypes/Makefile.am
|
||||
@@ -26,7 +26,7 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = examples/datatypes
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)datatypes.jar
|
||||
diff --git a/java/examples/groups/JavaGroupExample.sh.in b/java/examples/groups/JavaGroupExample.sh.in
|
||||
index 3b0e9d1..416c69f 100644
|
||||
--- a/java/examples/groups/JavaGroupExample.sh.in
|
||||
+++ b/java/examples/groups/JavaGroupExample.sh.in
|
||||
@@ -37,7 +37,7 @@ BLDDIR="."
|
||||
BLDLIBDIR="$BLDDIR/testlibs"
|
||||
BLDITERDIR="./groups"
|
||||
HDFTEST_HOME="$top_srcdir/java/examples/groups"
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
+JARFILE=@PACKAGE_TARNAME@.jar
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@groups.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
test -d $BLDITERDIR || mkdir -p $BLDITERDIR
|
||||
diff --git a/java/examples/groups/Makefile.am b/java/examples/groups/Makefile.am
|
||||
index bfde9ae..f48a5b9 100644
|
||||
--- a/java/examples/groups/Makefile.am
|
||||
+++ b/java/examples/groups/Makefile.am
|
||||
@@ -26,7 +26,7 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = examples/groups
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)groups.jar
|
||||
diff --git a/java/examples/intro/JavaIntroExample.sh.in b/java/examples/intro/JavaIntroExample.sh.in
|
||||
index db741e5..d0ba65d 100644
|
||||
--- a/java/examples/intro/JavaIntroExample.sh.in
|
||||
+++ b/java/examples/intro/JavaIntroExample.sh.in
|
||||
@@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
||||
BLDDIR="."
|
||||
BLDLIBDIR="$BLDDIR/testlibs"
|
||||
HDFTEST_HOME="$top_srcdir/java/examples/intro"
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
+JARFILE=@PACKAGE_TARNAME@.jar
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@intro.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
diff --git a/java/examples/intro/Makefile.am b/java/examples/intro/Makefile.am
|
||||
index 7d1aeab..01a10c9 100644
|
||||
--- a/java/examples/intro/Makefile.am
|
||||
+++ b/java/examples/intro/Makefile.am
|
||||
@@ -26,7 +26,7 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = examples/intro
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)intro.jar
|
||||
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
|
||||
index 98630e6..fd8d057 100644
|
||||
--- a/java/src/Makefile.am
|
||||
+++ b/java/src/Makefile.am
|
||||
@@ -32,8 +32,8 @@ JAVAROOT = .classes
|
||||
classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
-hdf5_javadir = $(libdir)
|
||||
+jarfile = $(PACKAGE_TARNAME).jar
|
||||
+hdf5_javadir = $(prefix)/lib/java
|
||||
|
||||
pkgpath = hdf/hdf5lib
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH
|
||||
diff --git a/java/test/Makefile.am b/java/test/Makefile.am
|
||||
index 08e79e3..b336c2f 100644
|
||||
--- a/java/test/Makefile.am
|
||||
+++ b/java/test/Makefile.am
|
||||
@@ -26,7 +26,7 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = test
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)test.jar
|
||||
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
|
||||
index 39db296..83d6c7c 100644
|
||||
--- a/java/test/junit.sh.in
|
||||
+++ b/java/test/junit.sh.in
|
||||
@@ -47,7 +47,7 @@ BLDLIBDIR="$BLDDIR/testlibs"
|
||||
HDFTEST_HOME="$top_srcdir/java/test"
|
||||
TOOLS_TESTFILES="$top_srcdir/tools/testfiles"
|
||||
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
+JARFILE=@PACKAGE_TARNAME@.jar
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
commit 3ea6f8c17228d2629e419563138a6180bc4a5a6a
|
||||
Author: Orion Poplawski <orion@nwra.com>
|
||||
Date: Sun Jan 30 15:21:08 2022 -0700
|
||||
|
||||
Mark minusone as a PARAMETER in tH5A_1_8.F90.
|
||||
|
||||
diff --git a/fortran/test/tH5A_1_8.F90 b/fortran/test/tH5A_1_8.F90
|
||||
index 4e02c58a39..c2f8e9984a 100644
|
||||
--- a/fortran/test/tH5A_1_8.F90
|
||||
+++ b/fortran/test/tH5A_1_8.F90
|
||||
@@ -776,7 +776,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
|
||||
|
||||
INTEGER :: Input1
|
||||
INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
|
||||
- INTEGER :: minusone = -1
|
||||
+ INTEGER, PARAMETER :: minusone = -1
|
||||
INTEGER(HSIZE_T) :: htmp
|
||||
|
||||
data_dims = 0
|
||||
@@ -1427,7 +1427,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
|
||||
INTEGER :: u ! Local index variable
|
||||
INTEGER :: Input1
|
||||
INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
|
||||
- INTEGER :: minusone = -1
|
||||
+ INTEGER, PARAMETER :: minusone = -1
|
||||
|
||||
data_dims = 0
|
||||
|
||||
@@ -2268,7 +2268,7 @@ SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
|
||||
INTEGER :: error
|
||||
|
||||
INTEGER :: crt_order_flags
|
||||
- INTEGER :: minusone = -1
|
||||
+ INTEGER, PARAMETER :: minusone = -1
|
||||
|
||||
! Output message about test being performed
|
||||
! WRITE(*,*) " - Testing Basic Code for Attributes with Creation Order Info"
|
||||
@ -1,7 +1,8 @@
|
||||
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@"
|
||||
diff --git a/bin/h5cc.in b/bin/h5cc.in
|
||||
index 9938c31..194818a 100644
|
||||
--- a/bin/h5cc.in
|
||||
+++ b/bin/h5cc.in
|
||||
@@ -87,10 +87,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.
|
||||
@ -15,17 +16,16 @@ diff -up hdf5-1.10.7/bin/h5cc.in.wrappers hdf5-1.10.7/bin/h5cc.in
|
||||
|
||||
CC="${HDF5_CC:-$CCBASE}"
|
||||
CLINKER="${HDF5_CLINKER:-$CLINKERBASE}"
|
||||
@@ -105,7 +105,8 @@ LIBS="${HDF5_LIBS:-$LIBSBASE}"
|
||||
@@ -103,7 +103,7 @@ 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
|
||||
@@ -380,7 +380,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.
|
||||
@ -34,10 +34,11 @@ diff -up hdf5-1.10.7/bin/h5cc.in.wrappers hdf5-1.10.7/bin/h5cc.in
|
||||
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@"
|
||||
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
|
||||
index 8830f3c..994a77f 100644
|
||||
--- a/c++/src/h5c++.in
|
||||
+++ b/c++/src/h5c++.in
|
||||
@@ -85,10 +85,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.
|
||||
@ -50,18 +51,17 @@ diff -up hdf5-1.10.7/c++/src/h5c++.in.wrappers hdf5-1.10.7/c++/src/h5c++.in
|
||||
+H5BLD_LIBS=
|
||||
|
||||
CXX="${HDF5_CXX:-$CXXBASE}"
|
||||
CXXLINKER="${HDF5_CLINKER:-$CXXLINKERBASE}"
|
||||
@@ -103,7 +103,8 @@ LIBS="${HDF5_LIBS:-$LIBSBASE}"
|
||||
CXXLINKER="${HDF5_CXXLINKER:-$CXXLINKERBASE}"
|
||||
@@ -101,7 +101,7 @@ 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
|
||||
@@ -372,7 +372,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.
|
||||
|
||||
@ -70,10 +70,11 @@ diff -up hdf5-1.10.7/c++/src/h5c++.in.wrappers hdf5-1.10.7/c++/src/h5c++.in
|
||||
|
||||
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@"
|
||||
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
|
||||
index 3c04425..450b71d 100644
|
||||
--- a/fortran/src/h5fc.in
|
||||
+++ b/fortran/src/h5fc.in
|
||||
@@ -82,11 +82,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.
|
||||
@ -88,17 +89,16 @@ diff -up hdf5-1.10.7/fortran/src/h5fc.in.wrappers hdf5-1.10.7/fortran/src/h5fc.i
|
||||
|
||||
FC="${HDF5_FC:-$FCBASE}"
|
||||
FLINKER="${HDF5_FLINKER:-$FLINKERBASE}"
|
||||
@@ -99,7 +99,8 @@ LIBS="${HDF5_LIBS:-$LIBSBASE}"
|
||||
@@ -98,7 +98,7 @@ 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
|
||||
@@ -359,7 +359,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.
|
||||
@ -107,3 +107,4 @@ diff -up hdf5-1.10.7/fortran/src/h5fc.in.wrappers hdf5-1.10.7/fortran/src/h5fc.i
|
||||
status=$?
|
||||
fi
|
||||
|
||||
|
||||
|
||||
113
hdf5.spec
113
hdf5.spec
@ -7,27 +7,26 @@
|
||||
%global mpi_list %{?mpi_list} openmpi
|
||||
%endif
|
||||
|
||||
%global so_version 200
|
||||
%global so_version 310
|
||||
|
||||
Name: hdf5
|
||||
Version: 1.12.1
|
||||
Version: 1.14.5
|
||||
Release: 1
|
||||
Summary: A data model, library, and file format for storing and managing data
|
||||
License: GPL-2.0-or-later
|
||||
License: BSD-3-Clause
|
||||
|
||||
URL: https://portal.hdfgroup.org/display/HDF5/HDF5
|
||||
Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.1/src/hdf5-1.12.1.tar.bz2
|
||||
URL: https://www.hdfgroup.org/solutions/hdf5/
|
||||
Source0: https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_5/downloads/hdf5-1.14.5.tar.gz
|
||||
Source1: h5comp
|
||||
|
||||
Patch0: hdf5-LD_LIBRARY_PATH.patch
|
||||
Patch1: hdf5-gfortran12.patch
|
||||
Patch2: hdf5-build.patch
|
||||
Patch3: hdf5-wrappers.patch
|
||||
Patch0: hdf5-wrappers.patch
|
||||
|
||||
BuildRequires: gcc, gcc-c++
|
||||
BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: openssh-clients
|
||||
BuildRequires: libaec-devel chrpath
|
||||
BuildRequires: libaec-devel
|
||||
BuildRequires: environment-modules
|
||||
|
||||
%description
|
||||
HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes, and is designed for flexible and efficient I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
|
||||
@ -118,10 +117,11 @@ sed -e 's|-O -finline-functions|-O3 -finline-functions|g' -i config/gnu-flags
|
||||
%global configure_opts \\\
|
||||
--disable-silent-rules \\\
|
||||
--enable-fortran \\\
|
||||
--enable-fortran2003 \\\
|
||||
--enable-hl \\\
|
||||
--enable-shared \\\
|
||||
--with-szlib \\\
|
||||
--enable-mirror-vfd \\\
|
||||
--disable-nonstandard-feature-float16 \\\
|
||||
%{nil}
|
||||
|
||||
export CC=gcc
|
||||
@ -168,18 +168,6 @@ done
|
||||
%install
|
||||
%make_install -C build
|
||||
%delete_la
|
||||
cat >h5comp <<EOF
|
||||
#!/bin/bash
|
||||
|
||||
ARCH=$(uname -m)
|
||||
|
||||
case $ARCH in
|
||||
x86_64 ) BITS=64;;
|
||||
* ) BITS=32;;
|
||||
esac
|
||||
|
||||
exec $0-${BITS} "$@"
|
||||
EOF
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
|
||||
mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod ${RPM_BUILD_ROOT}%{_fmoddir}
|
||||
|
||||
@ -194,8 +182,6 @@ do
|
||||
module purge
|
||||
done
|
||||
|
||||
find ${RPM_BUILD_ROOT}%{_datadir} \( -name '*.[ch]*' -o -name '*.f90' \) -exec chmod -x {} +
|
||||
|
||||
%ifarch x86_64
|
||||
sed -i -e s/H5pubconf.h/H5pubconf-64.h/ ${RPM_BUILD_ROOT}%{_includedir}/H5public.h
|
||||
mv ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf.h \
|
||||
@ -204,7 +190,7 @@ for x in h5c++ h5cc h5fc
|
||||
do
|
||||
mv ${RPM_BUILD_ROOT}%{_bindir}/${x} \
|
||||
${RPM_BUILD_ROOT}%{_bindir}/${x}-64
|
||||
install -m 0755 h5comp ${RPM_BUILD_ROOT}%{_bindir}/${x}
|
||||
install -m 0755 %SOURCE1 ${RPM_BUILD_ROOT}%{_bindir}/${x}
|
||||
done
|
||||
%else
|
||||
sed -i -e s/H5pubconf.h/H5pubconf-32.h/ ${RPM_BUILD_ROOT}%{_includedir}/H5public.h
|
||||
@ -214,7 +200,7 @@ for x in h5c++ h5cc h5fc
|
||||
do
|
||||
mv ${RPM_BUILD_ROOT}%{_bindir}/${x} \
|
||||
${RPM_BUILD_ROOT}%{_bindir}/${x}-32
|
||||
install -m 0755 h5comp ${RPM_BUILD_ROOT}%{_bindir}/${x}
|
||||
install -m 0755 %SOURCE1 ${RPM_BUILD_ROOT}%{_bindir}/${x}
|
||||
done
|
||||
%endif
|
||||
|
||||
@ -224,37 +210,22 @@ cat > ${RPM_BUILD_ROOT}/%{_rpmmacrodir}/macros.hdf5 <<EOF
|
||||
%%_hdf5_version %{version}
|
||||
EOF
|
||||
|
||||
cd $RPM_BUILD_ROOT/usr
|
||||
file `find -type f`| grep -w ELF | awk -F":" '{print $1}' | for i in `xargs`
|
||||
do
|
||||
chrpath -d $i
|
||||
done
|
||||
cd -
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
|
||||
echo "%{_libdir}/mpich/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} -C build check
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc MANIFEST README.txt release_docs/RELEASE.txt
|
||||
%doc release_docs/RELEASE.txt
|
||||
%doc release_docs/HISTORY*.txt
|
||||
%{_bindir}/gif2h5
|
||||
%{_bindir}/h52gif
|
||||
%{_bindir}/h5clear
|
||||
%{_bindir}/h5copy
|
||||
%{_bindir}/h5debug
|
||||
%{_bindir}/h5delete
|
||||
%{_bindir}/h5diff
|
||||
%{_bindir}/h5dump
|
||||
%{_bindir}/h5format_convert
|
||||
%{_bindir}/h5fuse
|
||||
%{_bindir}/h5import
|
||||
%{_bindir}/h5jam
|
||||
%{_bindir}/h5ls
|
||||
@ -273,7 +244,6 @@ make %{?_smp_mflags} -C build check
|
||||
%{_libdir}/libhdf5hl_fortran.so.%{so_version}*
|
||||
%{_libdir}/libhdf5_hl.so.%{so_version}*
|
||||
%{_libdir}/libhdf5_hl_cpp.so.%{so_version}*
|
||||
%config(noreplace) /etc/ld.so.conf.d/*
|
||||
|
||||
%files devel
|
||||
%{_bindir}/h5c++*
|
||||
@ -281,26 +251,26 @@ make %{?_smp_mflags} -C build check
|
||||
%{_bindir}/h5fc*
|
||||
%{_bindir}/h5redeploy
|
||||
%{_includedir}/*.h
|
||||
%{_includedir}/H5config_f.inc
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.settings
|
||||
%{_fmoddir}/*.mod
|
||||
%{_datadir}/hdf5_examples/
|
||||
%{_libdir}/*.a
|
||||
%{_rpmmacrodir}/macros.hdf5
|
||||
|
||||
%if %{with_mpich}
|
||||
%files mpich
|
||||
%license COPYING
|
||||
%doc MANIFEST README.txt release_docs/RELEASE.txt
|
||||
%doc release_docs/RELEASE.txt
|
||||
%doc release_docs/HISTORY*.txt
|
||||
%{_libdir}/mpich/bin/gif2h5
|
||||
%{_libdir}/mpich/bin/h52gif
|
||||
%{_libdir}/mpich/bin/h5clear
|
||||
%{_libdir}/mpich/bin/h5copy
|
||||
%{_libdir}/mpich/bin/h5debug
|
||||
%{_libdir}/mpich/bin/h5delete
|
||||
%{_libdir}/mpich/bin/h5diff
|
||||
%{_libdir}/mpich/bin/h5dump
|
||||
%{_libdir}/mpich/bin/h5format_convert
|
||||
%{_libdir}/mpich/bin/h5fuse
|
||||
%{_libdir}/mpich/bin/h5import
|
||||
%{_libdir}/mpich/bin/h5jam
|
||||
%{_libdir}/mpich/bin/h5ls
|
||||
@ -325,7 +295,6 @@ make %{?_smp_mflags} -C build check
|
||||
%{_libdir}/mpich/bin/h5pfc
|
||||
%{_libdir}/mpich/lib/lib*.so
|
||||
%{_libdir}/mpich/lib/lib*.settings
|
||||
%{_libdir}/mpich/share/hdf5_examples/
|
||||
|
||||
%files mpich-static
|
||||
%{_libdir}/mpich/lib/*.a
|
||||
@ -334,16 +303,16 @@ make %{?_smp_mflags} -C build check
|
||||
%if %{with_openmpi}
|
||||
%files openmpi
|
||||
%license COPYING
|
||||
%doc MANIFEST README.txt release_docs/RELEASE.txt
|
||||
%doc release_docs/RELEASE.txt
|
||||
%doc release_docs/HISTORY*.txt
|
||||
%{_libdir}/openmpi/bin/gif2h5
|
||||
%{_libdir}/openmpi/bin/h52gif
|
||||
%{_libdir}/openmpi/bin/h5clear
|
||||
%{_libdir}/openmpi/bin/h5copy
|
||||
%{_libdir}/openmpi/bin/h5debug
|
||||
%{_libdir}/openmpi/bin/h5delete
|
||||
%{_libdir}/openmpi/bin/h5diff
|
||||
%{_libdir}/openmpi/bin/h5dump
|
||||
%{_libdir}/openmpi/bin/h5format_convert
|
||||
%{_libdir}/openmpi/bin/h5fuse
|
||||
%{_libdir}/openmpi/bin/h5import
|
||||
%{_libdir}/openmpi/bin/h5jam
|
||||
%{_libdir}/openmpi/bin/h5ls
|
||||
@ -368,13 +337,47 @@ make %{?_smp_mflags} -C build check
|
||||
%{_libdir}/openmpi/bin/h5pfc
|
||||
%{_libdir}/openmpi/lib/lib*.so
|
||||
%{_libdir}/openmpi/lib/lib*.settings
|
||||
%{_libdir}/openmpi/share/hdf5_examples/
|
||||
|
||||
%files openmpi-static
|
||||
%{_libdir}/openmpi/lib/*.a
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Oct 30 2024 yaoxin <yao_xin001@hoperun.com> - 1.14.5-1
|
||||
- Update to 1.14.5:
|
||||
* Added signed Windows msi binary and signed Apple dmg binary files.
|
||||
* Moved examples to the HDF5Examples folder in the source tree.
|
||||
* Added support for using zlib-ng package as the zlib library
|
||||
* Disable CMake UNITY_BUILD for hdf5
|
||||
* Removed "function/code stack" debugging configuration option
|
||||
* Added configure options for enabling/disabling non-standard programming language features
|
||||
* Added the CMake variable HDF5_ENABLE_ROS3_VFD to the HDF5 CMake config
|
||||
file hdf5-config.cmake. This allows it to easily detect if the library
|
||||
has been built with or without read-only S3 functionality.
|
||||
* Fixed many CVE:
|
||||
CVE-2024-29157,CVE-2024-29158,CVE-2024-29159,CVE-2024-29160,CVE-2024-29161,CVE-2024-29162
|
||||
CVE-2024-29163,CVE-2024-29164,CVE-2024-29165,CVE-2024-29166,CVE-2024-32605,CVE-2024-32606
|
||||
CVE-2024-32607,CVE-2024-32608,CVE-2024-32609,CVE-2024-32610,CVE-2024-32611,CVE-2024-32612
|
||||
CVE-2024-32613,CVE-2024-32614,CVE-2024-32615,CVE-2024-32616,CVE-2024-32617,CVE-2024-32618
|
||||
CVE-2024-32619,CVE-2024-32620,CVE-2024-32621,CVE-2024-32622,CVE-2024-32623,CVE-2024-32624
|
||||
CVE-2024-33873,CVE-2024-33874,CVE-2024-33875,CVE-2024-33876,CVE-2024-33877,CVE-2018-13871
|
||||
CVE-2018-13875,CVE-2018-14034
|
||||
|
||||
* Wed Dec 20 2023 wangkai <13474090681@163.com> - 1.12.1-6
|
||||
- Add disable-hltools flag to fix CVE-2018-17433, CVE-2018-17436, CVE-2020-10809
|
||||
|
||||
* Thu Aug 31 2023 xu_ping <707078654@qq.com> - 1.12.1-5
|
||||
- Add BuildRequires environment-modules
|
||||
|
||||
* Tue Apr 11 2023 liyanan <thistleslyn@163.com> - 1.12.1-4
|
||||
- Preserve the rpath of the hdf5-openmpi and hdf5-mpich subpackages
|
||||
|
||||
* Mon Apr 10 2023 xu_ping <707078654@qq.com> - 1.12.1-3
|
||||
- fix some commands failed
|
||||
|
||||
* Tue Mar 28 2023 yaoxin <yaoxin30@h-partners.com> - 1.12.1-2
|
||||
- Fix CVE-2018-13867,CVE-2018-14031,CVE-2018-16438,CVE-2019-8396,CVE-2020-10812 and CVE-2021-37501
|
||||
|
||||
* Thu Jun 23 2022 wulei <wulei80@h-partners.com> - 1.12.1-1
|
||||
- Upgrade to 1.12.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user