Compare commits
211 Commits
epel8-play
...
rawhide
Author | SHA1 | Date | |
---|---|---|---|
|
e7d36b8a77 | ||
|
458e7977ff | ||
|
3f25ec1b0f | ||
|
e7e7c7b9b1 | ||
|
8ba4f13c97 | ||
|
1582e25568 | ||
|
e42775fc57 | ||
|
a5b10660f1 | ||
|
7c741371de | ||
|
a8d474b568 | ||
|
02b47ba987 | ||
|
726f5c4a2e | ||
|
b893ec5364 | ||
|
fb205c10df | ||
|
298288fd68 | ||
|
f0c9baac04 | ||
|
b33a0e23f1 | ||
|
b7d3e5a4d0 | ||
|
e919a76d18 | ||
|
65220218f2 | ||
|
7104c8b2a1 | ||
|
b21e31c408 | ||
|
b05b5b4f6a | ||
|
d981e4771c | ||
|
69df9b6ae9 | ||
|
afea0fc5c3 | ||
|
43ae4fbe04 | ||
|
820d1fc408 | ||
|
1ebce2dd0e | ||
|
acc900a8e5 | ||
|
90e57cd4ab | ||
|
271d4d242d | ||
|
df1a40d7ea | ||
|
6a442e1621 | ||
|
7461ed3f0f | ||
|
214dacd119 | ||
|
a030968d5d | ||
|
e05aa5780d | ||
|
c044c86773 | ||
|
12b8c6f261 | ||
|
458d98e201 | ||
|
0fc70b9d21 | ||
|
1c679f08aa | ||
|
758549561e | ||
|
1c50273afe | ||
|
6c54b9780d | ||
|
ebb0f8e3f2 | ||
|
8f5d226136 | ||
|
e7cbb6e843 | ||
|
a9d63cc3cb | ||
|
166fc6c840 | ||
|
bc3ab9e9f9 | ||
|
7ad3cd86a1 | ||
|
89c175cfa9 | ||
|
190e20a12c | ||
|
77990e288c | ||
|
9295233f61 | ||
|
99ebe21efd | ||
|
3ac2f50ccb | ||
|
0b6d201ccb | ||
|
7a28341939 | ||
|
2b5173547f | ||
|
b43b44cb88 | ||
|
afe68a8bf0 | ||
|
634507871a | ||
|
eecff2f9dc | ||
|
1a489ed4f8 | ||
|
e706252303 | ||
|
a22f315f42 | ||
|
4324dd0e28 | ||
|
467e01f8ae | ||
|
ae2a07d22d | ||
|
78ddcff82b | ||
|
a3f8aad740 | ||
|
072ca10da0 | ||
|
b7e31a4e33 | ||
|
ed2be27293 | ||
|
e35fe96976 | ||
|
2cdcf1a556 | ||
|
3878760512 | ||
|
1b695880a5 | ||
|
6d5f93265d | ||
|
f2a01e9908 | ||
|
dc0df100d5 | ||
|
2fd5a50783 | ||
|
9d4c19dc16 | ||
|
ac8724d63c | ||
|
eaa0af323c | ||
|
1411946688 | ||
|
dc1b5b336b | ||
|
f3ef5dadea | ||
|
3c728aa102 | ||
|
3ec3924efb | ||
|
8a3d144f32 | ||
|
4900aaea82 | ||
|
5fffc13432 | ||
|
a7254df4e8 | ||
|
e2aac18e72 | ||
|
940727319b | ||
|
5f0b88875d | ||
|
fb5eb771a8 | ||
|
49cc5862a1 | ||
|
3895edc806 | ||
|
738ea5d165 | ||
|
f1ccb01b51 | ||
|
a77fb8a14d | ||
|
362461d523 | ||
|
bf37fb05f4 | ||
|
c1af894247 | ||
|
3404fc18d8 | ||
|
8c9232ae4a | ||
|
168ad10b4b | ||
|
a9e79f9530 | ||
|
cc39ad0682 | ||
|
34c287d8fe | ||
|
cc55e1580b | ||
|
dbff8565ea | ||
|
c15a86043e | ||
|
f84b8627a8 | ||
|
3338e0bdf4 | ||
|
7468b4ff9d | ||
|
bb8eee6f82 | ||
|
ec7778ebf9 | ||
|
167e54c9d0 | ||
|
e5e6dcc4f2 | ||
|
d22ee46f8b | ||
|
a996bbc828 | ||
|
7180f87131 | ||
|
0ca3d5ccdc | ||
|
0db0de6244 | ||
|
e66863d9fa | ||
|
039161b9d6 | ||
|
ac12202c3d | ||
|
fe3820fc26 | ||
|
f4b44e30e0 | ||
|
4eb12d8148 | ||
|
d485d93ace | ||
|
79166aab3d | ||
|
2a78ffb146 | ||
|
8a26f2436f | ||
|
adb092edbe | ||
|
9f8e2dbdd2 | ||
|
30f183579f | ||
|
80b5c4b834 | ||
|
1f85332a3e | ||
|
a8071dba83 | ||
|
4c2266556f | ||
|
99ab817468 | ||
|
59133a9486 | ||
|
9a42197f36 | ||
|
55189b5069 | ||
|
1ae9e29408 | ||
|
6ff7643958 | ||
|
f6e9a837cd | ||
|
56cc5c14a0 | ||
|
425c0c4dc7 | ||
|
b00e8bb85a | ||
|
6278daf509 | ||
|
0d33588682 | ||
|
34801a9df3 | ||
|
98a440f3c9 | ||
|
89f5acb695 | ||
|
4456c63ded | ||
|
5ffa3a8802 | ||
|
93f48b758c | ||
|
e8b4b3b6f5 | ||
|
1ca91c3887 | ||
|
5690b849c9 | ||
|
95418c4346 | ||
|
4fbe05cdcd | ||
|
95580905d5 | ||
|
5c8fa87ab6 | ||
|
c05eb35e14 | ||
|
e743be254a | ||
|
c650c83c71 | ||
|
ba064df59d | ||
|
e85fb8abf5 | ||
|
c189106188 | ||
|
759df1f4d1 | ||
|
9ad1a598d3 | ||
|
5c0aed4775 | ||
|
7690c34986 | ||
|
49b0177859 | ||
|
aad3b63a63 | ||
|
609272dcb8 | ||
|
52ff7b205f | ||
|
dd0dbfa5b7 | ||
|
f659110776 | ||
|
cf4e469390 | ||
|
6d6a47ccf9 | ||
|
9524502e0e | ||
|
7e03d23eac | ||
|
3965688d6d | ||
|
c1a6a30979 | ||
|
68149bd709 | ||
|
a07fdff2f4 | ||
|
910b2fd5e4 | ||
|
d17a8e17d2 | ||
|
6081e4e5ea | ||
|
f168b83d56 | ||
|
c5794b038e | ||
|
035a819f7b | ||
|
4167480bd3 | ||
|
56754fc530 | ||
|
7a15161df3 | ||
|
6a5535bee9 | ||
|
3ea0e2f839 | ||
|
4e299e9c85 | ||
|
5230a3bc0e | ||
|
55328d76fb | ||
|
b5174ee468 |
36
.gitignore
vendored
Normal file
36
.gitignore
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
hdf5-1.8.5.tar.bz2
|
||||
/hdf5-1.8.5-patch1.tar.bz2
|
||||
/hdf5-1.8.6.tar.bz2
|
||||
/hdf5-1.8.7.tar.bz2
|
||||
/hdf5-1.8.8.tar.bz2
|
||||
/hdf5-1.8.9.tar.bz2
|
||||
/hdf5-1.8.10.tar.bz2
|
||||
/hdf5-1.8.11.tar.bz2
|
||||
/hdf5_1.8.10-patch1-1.debian.tar.gz
|
||||
/hdf5-1.8.12.tar.bz2
|
||||
/hdf5_1.8.12-1.debian.tar.gz
|
||||
/hdf5_1.8.12-4.debian.tar.gz
|
||||
/hdf5-1.8.13.tar.bz2
|
||||
/hdf5_1.8.12+docs-1.1.debian.tar.xz
|
||||
/hdf5-1.8.14.tar.bz2
|
||||
/hdf5_1.8.13+docs-15.debian.tar.xz
|
||||
/hdf5-1.8.15.tar.bz2
|
||||
/hdf5_1.8.14+docs-3.debian.tar.xz
|
||||
/hdf5-1.8.15-patch1.tar.bz2
|
||||
/hdf5-1.8.16.tar.bz2
|
||||
/hdf5_1.8.15-patch1+docs-5.debian.tar.xz
|
||||
/hdf5-1.8.17.tar.bz2
|
||||
/hdf5_1.8.16+docs-8.debian.tar.xz
|
||||
/hdf5-1.8.18.tar.bz2
|
||||
/hdf5-1.8.20.tar.bz2
|
||||
/hdf5-1.10.3.tar.bz2
|
||||
/hdf5_1.10.2+repack-1~exp1.debian.tar.xz
|
||||
/hdf5-1.10.4.tar.bz2
|
||||
/hdf5_1.10.4+repack-1.debian.tar.xz
|
||||
/hdf5-1.10.5.tar.bz2
|
||||
/hdf5-1.10.6.tar.bz2
|
||||
/hdf5-1.10.7.tar.bz2
|
||||
/hdf5_1.10.6+repack-2.debian.tar.xz
|
||||
/hdf5-1.12.0.tar.bz2
|
||||
/hdf5-1.12.1.tar.bz2
|
||||
/hdf5_1.12.0+repack-1~exp2.debian.tar.xz
|
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: hdf5
|
||||
# $Id$
|
||||
NAME := hdf5
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
10
h5comp
Normal file
10
h5comp
Normal file
@ -0,0 +1,10 @@
|
||||
#!/bin/bash
|
||||
|
||||
ARCH=$(uname -m)
|
||||
|
||||
case $ARCH in
|
||||
x86_64 | ppc64 | ia64 | s390x ) BITS=64;;
|
||||
* ) BITS=32;;
|
||||
esac
|
||||
|
||||
exec $0-${BITS} "$@"
|
20
hdf5-LD_LIBRARY_PATH.patch
Normal file
20
hdf5-LD_LIBRARY_PATH.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- 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
Normal file
145
hdf5-build.patch
Normal file
@ -0,0 +1,145 @@
|
||||
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
|
||||
|
37
hdf5-gfortran12.patch
Normal file
37
hdf5-gfortran12.patch
Normal file
@ -0,0 +1,37 @@
|
||||
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"
|
109
hdf5-wrappers.patch
Normal file
109
hdf5-wrappers.patch
Normal file
@ -0,0 +1,109 @@
|
||||
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
|
||||
|
2
sources
2
sources
@ -0,0 +1,2 @@
|
||||
SHA512 (hdf5-1.12.1.tar.bz2) = 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
|
||||
SHA512 (hdf5_1.12.0+repack-1~exp2.debian.tar.xz) = 4c58d3021a634abe79211a6292d105f0ac9f1cc748e5033f8fefa845265e37104a3d6ef91deac51b85a26b5bc426095ca80ea606e1c3b730d3709368f8ffee9c
|
Loading…
Reference in New Issue
Block a user