Skip to content

Commit 87b05a4

Browse files
Upgrade hdf to 4.3.0 (#10864)
1 parent 5ed4959 commit 87b05a4

12 files changed

Lines changed: 33 additions & 1220 deletions

SPECS-EXTENDED/hdf/hdf-4.2.4-sparc.patch

Lines changed: 0 additions & 78 deletions
This file was deleted.

SPECS-EXTENDED/hdf/hdf-aarch64.patch

Lines changed: 0 additions & 289 deletions
This file was deleted.

SPECS-EXTENDED/hdf/hdf-arm.patch

Lines changed: 0 additions & 81 deletions
This file was deleted.

SPECS-EXTENDED/hdf/hdf-build.patch

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
1-
diff -up hdf-4.2.15/java/examples/Makefile.am.build hdf-4.2.15/java/examples/Makefile.am
2-
--- hdf-4.2.15/java/examples/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
3-
+++ hdf-4.2.15/java/examples/Makefile.am 2020-04-30 21:34:13.856216928 -0600
4-
@@ -12,8 +12,8 @@ classes:
5-
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
6-
7-
pkgpath = examples
8-
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
9-
-jarfile = jar$(PACKAGE_TARNAME)examples.jar
10-
+hdfjarfile = $(PACKAGE_TARNAME).jar
11-
+jarfile = $(PACKAGE_TARNAME)examples.jar
12-
13-
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
14-
AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation
15-
diff -up hdf-4.2.15/java/src/jni/Makefile.am.build hdf-4.2.15/java/src/jni/Makefile.am
16-
--- hdf-4.2.15/java/src/jni/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
17-
+++ hdf-4.2.15/java/src/jni/Makefile.am 2020-04-30 21:34:13.857216934 -0600
1+
diff -up hdf4-master/java/src/jni/Makefile.am.build hdf4-master/java/src/jni/Makefile.am
2+
--- hdf4-master/java/src/jni/Makefile.am.build 2024-02-06 22:11:46.219972170 -0700
3+
+++ hdf4-master/java/src/jni/Makefile.am 2024-02-06 22:12:33.262288868 -0700
184
@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
19-
$(JNIFLAGS) $(XDRINC)
5+
$(JNIFLAGS)
206

217
# This is our main target
228
-lib_LTLIBRARIES=libhdf_java.la
@@ -27,9 +13,9 @@ diff -up hdf-4.2.15/java/src/jni/Makefile.am.build hdf-4.2.15/java/src/jni/Makef
2713

2814
# Source files for the library
2915
libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
30-
diff -up hdf-4.2.15/java/src/Makefile.am.build hdf-4.2.15/java/src/Makefile.am
31-
--- hdf-4.2.15/java/src/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
32-
+++ hdf-4.2.15/java/src/Makefile.am 2020-04-30 21:34:13.857216934 -0600
16+
diff -up hdf4-master/java/src/Makefile.am.build hdf4-master/java/src/Makefile.am
17+
--- hdf4-master/java/src/Makefile.am.build 2024-02-06 17:40:20.000000000 -0700
18+
+++ hdf4-master/java/src/Makefile.am 2024-02-06 22:11:46.219972170 -0700
3319
@@ -13,8 +13,8 @@ JAVAROOT = .classes
3420
classes:
3521
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
@@ -40,10 +26,10 @@ diff -up hdf-4.2.15/java/src/Makefile.am.build hdf-4.2.15/java/src/Makefile.am
4026
+hdf_javadir = $(prefix)/lib/java
4127

4228
pkgpath = hdf/hdflib
43-
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH
44-
diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in
45-
--- hdf-4.2.15/java/test/junit.sh.in.build 2020-03-03 10:40:50.000000000 -0700
46-
+++ hdf-4.2.15/java/test/junit.sh.in 2020-04-30 21:34:13.858216939 -0600
29+
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
30+
diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.in
31+
--- hdf4-master/java/test/junit.sh.in.build 2024-02-06 17:40:20.000000000 -0700
32+
+++ hdf4-master/java/test/junit.sh.in 2024-02-06 22:11:46.219972170 -0700
4733
@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
4834
BLDLIBDIR="$top_builddir/hdf4/lib"
4935
BLDDIR="."
@@ -53,15 +39,15 @@ diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in
5339
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
5440
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
5541

56-
diff -up hdf-4.2.15/java/test/Makefile.am.build hdf-4.2.15/java/test/Makefile.am
57-
--- hdf-4.2.15/java/test/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
58-
+++ hdf-4.2.15/java/test/Makefile.am 2020-04-30 21:41:47.966938811 -0600
42+
diff -up hdf4-master/java/test/Makefile.am.build hdf4-master/java/test/Makefile.am
43+
--- hdf4-master/java/test/Makefile.am.build 2024-02-06 17:40:20.000000000 -0700
44+
+++ hdf4-master/java/test/Makefile.am 2024-02-06 22:11:46.219972170 -0700
5945
@@ -12,7 +12,7 @@ classes:
6046
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
6147

6248
pkgpath = test
6349
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
6450
+hdfjarfile = $(PACKAGE_TARNAME).jar
65-
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
51+
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.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
6652

6753
jarfile = jar$(PACKAGE_TARNAME)test.jar

SPECS-EXTENDED/hdf/hdf-destdir.patch

Lines changed: 0 additions & 70 deletions
This file was deleted.

SPECS-EXTENDED/hdf/hdf-examplesdir.patch

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)