Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade hdf to 4.3.0 #10864

Open
wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions SPECS-EXTENDED/hdf/hdf-4.2.4-sparc.patch

This file was deleted.

289 changes: 0 additions & 289 deletions SPECS-EXTENDED/hdf/hdf-aarch64.patch

This file was deleted.

81 changes: 0 additions & 81 deletions SPECS-EXTENDED/hdf/hdf-arm.patch

This file was deleted.

44 changes: 15 additions & 29 deletions SPECS-EXTENDED/hdf/hdf-build.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
diff -up hdf-4.2.15/java/examples/Makefile.am.build hdf-4.2.15/java/examples/Makefile.am
--- hdf-4.2.15/java/examples/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
+++ hdf-4.2.15/java/examples/Makefile.am 2020-04-30 21:34:13.856216928 -0600
@@ -12,8 +12,8 @@ classes:
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)

pkgpath = examples
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
-jarfile = jar$(PACKAGE_TARNAME)examples.jar
+hdfjarfile = $(PACKAGE_TARNAME).jar
+jarfile = $(PACKAGE_TARNAME)examples.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
AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation
diff -up hdf-4.2.15/java/src/jni/Makefile.am.build hdf-4.2.15/java/src/jni/Makefile.am
--- hdf-4.2.15/java/src/jni/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
+++ hdf-4.2.15/java/src/jni/Makefile.am 2020-04-30 21:34:13.857216934 -0600
diff -up hdf4-master/java/src/jni/Makefile.am.build hdf4-master/java/src/jni/Makefile.am
--- hdf4-master/java/src/jni/Makefile.am.build 2024-02-06 22:11:46.219972170 -0700
+++ hdf4-master/java/src/jni/Makefile.am 2024-02-06 22:12:33.262288868 -0700
@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
$(JNIFLAGS) $(XDRINC)
$(JNIFLAGS)

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

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

pkgpath = hdf/hdflib
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH
diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in
--- hdf-4.2.15/java/test/junit.sh.in.build 2020-03-03 10:40:50.000000000 -0700
+++ hdf-4.2.15/java/test/junit.sh.in 2020-04-30 21:34:13.858216939 -0600
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.in
--- hdf4-master/java/test/junit.sh.in.build 2024-02-06 17:40:20.000000000 -0700
+++ hdf4-master/java/test/junit.sh.in 2024-02-06 22:11:46.219972170 -0700
@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
BLDLIBDIR="$top_builddir/hdf4/lib"
BLDDIR="."
Expand All @@ -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
TESTJARFILE=jar@[email protected]
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR

diff -up hdf-4.2.15/java/test/Makefile.am.build hdf-4.2.15/java/test/Makefile.am
--- hdf-4.2.15/java/test/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
+++ hdf-4.2.15/java/test/Makefile.am 2020-04-30 21:41:47.966938811 -0600
diff -up hdf4-master/java/test/Makefile.am.build hdf4-master/java/test/Makefile.am
--- hdf4-master/java/test/Makefile.am.build 2024-02-06 17:40:20.000000000 -0700
+++ hdf4-master/java/test/Makefile.am 2024-02-06 22:11:46.219972170 -0700
@@ -12,7 +12,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
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

jarfile = jar$(PACKAGE_TARNAME)test.jar
70 changes: 0 additions & 70 deletions SPECS-EXTENDED/hdf/hdf-destdir.patch

This file was deleted.

50 changes: 0 additions & 50 deletions SPECS-EXTENDED/hdf/hdf-examplesdir.patch

This file was deleted.

Loading
Loading