From a1a3429516a169534f1a9da0c714117bb067d444 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Aug 2019 10:16:51 -0500 Subject: [PATCH 01/40] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 63e06769d671a286d91a64920b8134e5926af59a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 8 Nov 2019 21:43:44 -0700 Subject: [PATCH 02/40] Move compile scripts to hdf-devel and allow multilib install (bz#1769326) Split shared libraries into hdf-libs sub-package --- h4comp | 6 ++++++ hdf.spec | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 h4comp diff --git a/h4comp b/h4comp new file mode 100644 index 0000000..aeb861b --- /dev/null +++ b/h4comp @@ -0,0 +1,6 @@ +#!/bin/bash + +BITS=32 +[ -d /usr/lib64 ] && BITS=64 + +exec $0-${BITS} "$@" diff --git a/hdf.spec b/hdf.spec index 3a540ae..c6508f4 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,11 +4,12 @@ Name: hdf Version: 4.2.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2 +Source1: h4comp Patch0: hdf-4.2.5-maxavailfiles.patch Patch1: hdf-ppc.patch Patch2: hdf-4.2.4-sparc.patch @@ -42,6 +43,7 @@ BuildRequires: javapackages-tools BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -57,7 +59,7 @@ grids. You can also mix and match them in HDF4 files according to your needs. %package devel Summary: HDF4 development files Provides: %{name}-static = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: libjpeg-devel%{?_isa} Requires: libtirpc-devel%{?_isa} Requires: zlib-devel%{?_isa} @@ -66,6 +68,13 @@ Requires: zlib-devel%{?_isa} HDF4 development headers and libraries. +%package libs +Summary: HDF4 shared libraries + +%description libs +HDF4 shared libraries. + + %package static Summary: HDF4 static libraries Requires: %{name}-devel = %{version}-%{release} @@ -186,6 +195,29 @@ touch -c -r h4config.h h4config.h.tmp mv h4config.h.tmp h4config.h popd +#Fixup headers and scripts for multiarch +%if %{_lib} == lib64 +#sed -i -e s/H5pubconf.h/H5pubconf-64.h/ %{buildroot}%{_includedir}/H5public.h +#mv %{buildroot}%{_includedir}/H5pubconf.h \ + #%{buildroot}%{_includedir}/H5pubconf-64.h +for x in h4cc h4fc +do + mv %{buildroot}%{_bindir}/${x} \ + %{buildroot}%{_bindir}/${x}-64 + install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x} +done +%else +#sed -i -e s/H5pubconf.h/H5pubconf-32.h/ %{buildroot}%{_includedir}/H5public.h +#mv %{buildroot}%{_includedir}/H5pubconf.h \ + #%{buildroot}%{_includedir}/H5pubconf-32.h +for x in h4cc h4fc +do + mv %{buildroot}%{_bindir}/${x} \ + %{buildroot}%{_bindir}/${x}-32 + install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x} +done +%endif + %check make -j1 -C build-shared check @@ -197,15 +229,20 @@ make -j1 -C build-static check %{_pkgdocdir}/ %exclude %{_pkgdocdir}/examples %{_bindir}/* +%exclude %{_bindir}/h4?c* %{_libdir}/*.so.0* %{_mandir}/man1/*.gz %files devel +%{_bindir}/h4?c* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/*.settings %{_pkgdocdir}/examples/ +%files libs +%{_libdir}/*.so.0* + %files static %{_libdir}/*.a @@ -215,6 +252,10 @@ make -j1 -C build-static check %changelog +* Fri Nov 8 2019 Orion Poplawski - 4.2.14-6 +- Move compile scripts to hdf-devel and allow multilib install (bz#1769326) +- Split shared libraries into hdf-libs sub-package + * Thu Jul 25 2019 Fedora Release Engineering - 4.2.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6151ec0d1c041374d31ceec5ef95d6711ab95174 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 04:10:47 +0000 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index c6508f4..7f9133d 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -252,6 +252,9 @@ make -j1 -C build-static check %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 4.2.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 8 2019 Orion Poplawski - 4.2.14-6 - Move compile scripts to hdf-devel and allow multilib install (bz#1769326) - Split shared libraries into hdf-libs sub-package From 4a8a1b17e2ed07e23eb1b3814fd176bf8b62c8c4 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 2 Feb 2020 18:58:21 +0100 Subject: [PATCH 04/40] Temporary workaround for compiling with GCC-10 --- hdf.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 7f9133d..da34d55 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -135,8 +135,10 @@ touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h # For destdir/examplesdir patches autoreconf -vif + # avoid upstream compiler flags settings rm config/*linux-gnu + # TODO: upstream fix # libmfhdf.so is link to libdf.so export CFLAGS="%{optflags} -I%{_includedir}/tirpc" @@ -154,6 +156,11 @@ cd - mkdir build-static cd build-static # Java requires shared libraries, fortran requires static + +# Temporary workaround for compiling on GCC-10 +%if 0%{?fedora} && 0%{?fedora} > 31 +export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" +%endif %configure --disable-production --disable-java --disable-netcdf \ --enable-shared=no --enable-static=yes --enable-fortran %{!?el6:--with-szlib} \ --includedir=%{_includedir}/%{name} @@ -252,6 +259,9 @@ make -j1 -C build-static check %changelog +* Sun Feb 02 2020 Antonio Trande 4.2.14-8 +- Temporary workaround for compiling with GCC-10 + * Wed Jan 29 2020 Fedora Release Engineering - 4.2.14-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c711f74cfde02d06e914da189f256cc596cfbcee Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 2 Feb 2020 19:06:03 +0100 Subject: [PATCH 05/40] Export FFLAGS too --- hdf.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hdf.spec b/hdf.spec index da34d55..ff7ad65 100644 --- a/hdf.spec +++ b/hdf.spec @@ -160,6 +160,7 @@ cd build-static # Temporary workaround for compiling on GCC-10 %if 0%{?fedora} && 0%{?fedora} > 31 export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" +export FFLAGS="%{build_fflags} -fallow-argument-mismatch" %endif %configure --disable-production --disable-java --disable-netcdf \ --enable-shared=no --enable-static=yes --enable-fortran %{!?el6:--with-szlib} \ From 018885023d39182b8166d107db1cd74a3685e8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 2 Apr 2020 12:58:46 +0200 Subject: [PATCH 06/40] Fix string quoting for rpm >= 4.16 --- hdf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index ff7ad65..39b37a7 100644 --- a/hdf.spec +++ b/hdf.spec @@ -204,7 +204,7 @@ mv h4config.h.tmp h4config.h popd #Fixup headers and scripts for multiarch -%if %{_lib} == lib64 +%if "%{_lib}" == "lib64" #sed -i -e s/H5pubconf.h/H5pubconf-64.h/ %{buildroot}%{_includedir}/H5public.h #mv %{buildroot}%{_includedir}/H5pubconf.h \ #%{buildroot}%{_includedir}/H5pubconf-64.h From c0de79838c0af64503459238ef649557eee90e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 2 Apr 2020 13:30:19 +0200 Subject: [PATCH 07/40] Bump release --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 39b37a7..e411ffe 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -260,6 +260,9 @@ make -j1 -C build-static check %changelog +* Thu Apr 02 2020 Björn Esser - 4.2.14-9 +- Fix string quoting for rpm >= 4.16 + * Sun Feb 02 2020 Antonio Trande 4.2.14-8 - Temporary workaround for compiling with GCC-10 From 4fe0dd43c5cdfc9a4366a8347b6af086c6e942dd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 30 Apr 2020 22:07:32 -0600 Subject: [PATCH 08/40] Update to 4.2.15 --- .gitignore | 1 + hdf-4.2.10-aarch64.patch => hdf-aarch64.patch | 269 ++++++++---------- hdf-build.patch | 42 +-- hdf-ppc.patch | 122 ++++---- hdf-ppc64le.patch | 32 ++- hdf-s390.patch | 259 ++++++++--------- hdf.spec | 17 +- sources | 2 +- 8 files changed, 339 insertions(+), 405 deletions(-) rename hdf-4.2.10-aarch64.patch => hdf-aarch64.patch (51%) diff --git a/.gitignore b/.gitignore index d3b8ef4..5b1976d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ hdf-4.2.5.tar.bz2 /hdf-4.2.12.tar.bz2 /hdf-4.2.13.tar.bz2 /hdf-4.2.14.tar.bz2 +/hdf-4.2.15.tar.bz2 diff --git a/hdf-4.2.10-aarch64.patch b/hdf-aarch64.patch similarity index 51% rename from hdf-4.2.10-aarch64.patch rename to hdf-aarch64.patch index a2699c3..1865e72 100644 --- a/hdf-4.2.10-aarch64.patch +++ b/hdf-aarch64.patch @@ -1,7 +1,6 @@ -Index: hdf-4.2.10/hdf/src/hconv.h -=================================================================== ---- hdf-4.2.10.orig/hdf/src/hconv.h -+++ hdf-4.2.10/hdf/src/hconv.h +diff -up hdf-4.2.15/hdf/src/hconv.h.aarch64 hdf-4.2.15/hdf/src/hconv.h +--- hdf-4.2.15/hdf/src/hconv.h.aarch64 2020-04-30 21:16:25.325499508 -0600 ++++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:16:25.338499580 -0600 @@ -59,7 +59,7 @@ /* CONSTANT DEFINITIONS */ /*****************************************************************************/ @@ -11,10 +10,9 @@ Index: hdf-4.2.10/hdf/src/hconv.h # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ # define UI8_OUT DFKnb1b # define SI16_IN DFKnb2b /* S = Signed */ -Index: hdf-4.2.10/hdf/src/hdfi.h -=================================================================== ---- hdf-4.2.10.orig/hdf/src/hdfi.h -+++ hdf-4.2.10/hdf/src/hdfi.h +diff -up hdf-4.2.15/hdf/src/hdfi.h.aarch64 hdf-4.2.15/hdf/src/hdfi.h +--- hdf-4.2.15/hdf/src/hdfi.h.aarch64 2020-04-30 21:16:25.326499514 -0600 ++++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:16:25.340499591 -0600 @@ -79,6 +79,7 @@ #define DFMT_LINUXSPARC 0x1111 #define DFMT_LINUX390 0x1111 @@ -23,7 +21,7 @@ Index: hdf-4.2.10/hdf/src/hdfi.h /* I/O library constants */ #define UNIXUNBUFIO 1 -@@ -1337,6 +1338,44 @@ typedef long hdf_pint_t; +@@ -1341,6 +1342,44 @@ typedef long hdf_pint_t; #endif /* IA64 */ @@ -68,22 +66,21 @@ Index: hdf-4.2.10/hdf/src/hdfi.h #ifndef GOT_MACHINE No machine type has been defined. Your Makefile needs to have someing like -DSUN or -DUNICOS in order for the HDF internal structures to be defined -Index: hdf-4.2.10/mfhdf/fortran/jackets.c.in -=================================================================== ---- hdf-4.2.10.orig/mfhdf/fortran/jackets.c.in -+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in +diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 hdf-4.2.15/mfhdf/fortran/jackets.c.in +--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 2020-04-30 21:16:25.318499470 -0600 ++++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:20:28.346831868 -0600 @@ -34,7 +34,7 @@ - struct ncfils { /* This will be a common block from Fortran */ + struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ int ll; #else long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm +@@ -65,7 +65,7 @@ struct ncfils { /* This will - struct ncfils { /* This will be a common block from Fortran */ + struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ @@ -100,127 +97,102 @@ Index: hdf-4.2.10/mfhdf/fortran/jackets.c.in * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL @@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; + long longs = *(int *)value; @@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); + long *longs = itol (value, ncount, ndims); @@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); + tmpbasis = nctypelen(NC_LONG); else #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ if (datatype == NC_LONG) - tmpbasis = sizeof(int); + tmpbasis = sizeof(int); else @@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); + long *longs = itolg (value, ncount, nbasis, ndims); @@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; + long longs; @@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); + tmpbasis = nctypelen(NC_LONG); else #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ if (datatype == NC_LONG) - tmpbasis = sizeof(int); + tmpbasis = sizeof(int); else @@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); + long *longs = itol (value, attlen, 1); @@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -Index: hdf-4.2.10/mfhdf/libsrc/array.c -=================================================================== ---- hdf-4.2.10.orig/mfhdf/libsrc/array.c -+++ hdf-4.2.10/mfhdf/libsrc/array.c -@@ -620,7 +620,7 @@ xdr_NC_array(xdrs, app) - xdr_NC_fnct = xdr_shorts ; - goto func ; - case NC_LONG : --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -Index: hdf-4.2.10/mfhdf/libsrc/cdf.c -=================================================================== ---- hdf-4.2.10.orig/mfhdf/libsrc/cdf.c -+++ hdf-4.2.10/mfhdf/libsrc/cdf.c -@@ -3662,7 +3662,7 @@ NC_var *vp ; - break ; - case NC_LONG : - alen /= 4 ; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -Index: hdf-4.2.10/mfhdf/libsrc/netcdf.h.in -=================================================================== ---- hdf-4.2.10.orig/mfhdf/libsrc/netcdf.h.in -+++ hdf-4.2.10/mfhdf/libsrc/netcdf.h.in +diff -up hdf-4.2.15/mfhdf/libsrc/array.c.aarch64 hdf-4.2.15/mfhdf/libsrc/array.c +diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.aarch64 hdf-4.2.15/mfhdf/libsrc/cdf.c +diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in +--- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 2020-04-30 21:16:25.347499629 -0600 ++++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:24:11.366838259 -0600 @@ -293,7 +293,7 @@ typedef double ncdouble; - /* + /* * Variables/attributes of type NC_LONG should use the C type 'nclong' */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ @@ -228,33 +200,22 @@ Index: hdf-4.2.10/mfhdf/libsrc/netcdf.h.in /* * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. * http://www.unix.org/version2/whatsnew/lp64_wp.html -Index: hdf-4.2.10/mfhdf/libsrc/putget.c -=================================================================== ---- hdf-4.2.10.orig/mfhdf/libsrc/putget.c -+++ hdf-4.2.10/mfhdf/libsrc/putget.c -@@ -664,7 +664,7 @@ Void *values ; - case NC_SHORT : - return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; - case NC_LONG : --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - return( xdr_int(xdrs, (nclong *)values) ) ; +diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 hdf-4.2.15/mfhdf/libsrc/putget.c +--- hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 2020-04-30 21:16:25.349499640 -0600 ++++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:21:11.344052951 -0600 +@@ -665,7 +665,7 @@ Void *values ; + case NC_SHORT : + return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; + case NC_LONG : +-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ ++#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ + return( xdr_int(xdrs, (nclong *)values) ) ; #else - return( xdr_long(xdrs, (nclong *)values) ) ; -@@ -1975,7 +1975,7 @@ Void *values ; - } /* else */ - return(TRUE) ; - case NC_LONG : --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c -=================================================================== ---- hdf-4.2.10.orig/mfhdf/libsrc/xdrposix.c -+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c -@@ -250,7 +250,7 @@ int nbytes; + return( xdr_long(xdrs, (nclong *)values) ) ; +diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 hdf-4.2.15/mfhdf/libsrc/xdrposix.c +--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 2020-04-30 21:16:25.321499486 -0600 ++++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:23:48.397752506 -0600 +@@ -262,7 +262,7 @@ int nbytes; static bool_t xdrposix_getlong(); static bool_t xdrposix_putlong(); @@ -263,7 +224,7 @@ Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c static bool_t xdrposix_getint(); static bool_t xdrposix_putint(); #endif -@@ -264,7 +264,7 @@ static long * xdrposix_inline(); +@@ -276,7 +276,7 @@ static long * xdrposix_inline(); #if (defined __sun && defined _LP64) static rpc_inline_t * xdrposix_inline(); #else @@ -271,29 +232,29 @@ Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c +#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ static int32_t * xdrposix_inline(); #else - #if (defined __alpha ) -@@ -294,9 +294,9 @@ static struct xdr_ops xdrposix_ops = { + static netlong * xdrposix_inline(); +@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = { xdrposix_getpos, /* get offset in the stream */ xdrposix_setpos, /* set offset in the stream */ xdrposix_inline, /* prime stream for inline macros */ -#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ xdrposix_destroy, /* destroy stream */ --#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __aarch64__) && !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ +-#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ ++#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) && !(defined __aarch64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ NULL, /* no xdr_control function defined */ - #endif + #endif /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ -@@ -552,7 +552,7 @@ static rpc_inline_t * - #if (defined __alpha) - static int* +@@ -560,7 +560,7 @@ static long * + #if (defined __sun && defined _LP64) + static rpc_inline_t * #else -#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ +#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static int32_t * + static int32_t * #else - static netlong * -@@ -580,7 +580,7 @@ int + static netlong * +@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len) return (NULL); } @@ -302,29 +263,27 @@ Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c static bool_t xdrposix_getint(xdrs, lp) -Index: hdf-4.2.10/mfhdf/ncgen/ncgen.l -=================================================================== ---- hdf-4.2.10.orig/mfhdf/ncgen/ncgen.l -+++ hdf-4.2.10/mfhdf/ncgen/ncgen.l -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss - yyerror(errstr); - } +diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgen.l +--- hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 2020-04-30 21:16:25.376499789 -0600 ++++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:17:29.876854089 -0600 +@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m + yyerror(errstr); + } -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (dd < INT_MIN || dd > INT_MAX) + if (dd < INT_MIN || dd > INT_MAX) #else - if (dd < LONG_MIN || dd > LONG_MAX) -Index: hdf-4.2.10/mfhdf/ncgen/ncgenyy.c -=================================================================== ---- hdf-4.2.10.orig/mfhdf/ncgen/ncgenyy.c -+++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c -@@ -989,7 +989,7 @@ YY_RULE_SETUP - yyerror(errstr); - } + if (dd < LONG_MIN || dd > LONG_MAX) +diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c +--- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 2020-04-30 21:16:25.382499822 -0600 ++++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:18:12.880090311 -0600 +@@ -991,7 +991,7 @@ YY_RULE_SETUP + yyerror(errstr); + } -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || __aarch64__ - if (dd < INT_MIN || dd > INT_MAX) ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || defined __aarch64__ + if (dd < INT_MIN || dd > INT_MAX) #else - if (dd < LONG_MIN || dd > LONG_MAX) + if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/hdf-build.patch b/hdf-build.patch index 8e8a095..099dd83 100644 --- a/hdf-build.patch +++ b/hdf-build.patch @@ -1,6 +1,6 @@ -diff -up hdf-4.2.14/java/examples/Makefile.am.build hdf-4.2.14/java/examples/Makefile.am ---- hdf-4.2.14/java/examples/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600 -+++ hdf-4.2.14/java/examples/Makefile.am 2019-04-10 20:01:42.336828053 -0600 +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) @@ -10,13 +10,13 @@ diff -up hdf-4.2.14/java/examples/Makefile.am.build hdf-4.2.14/java/examples/Mak +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.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH + 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.14/java/src/jni/Makefile.am.build hdf-4.2.14/java/src/jni/Makefile.am ---- hdf-4.2.14/java/src/jni/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600 -+++ hdf-4.2.14/java/src/jni/Makefile.am 2019-04-10 20:47:55.397873538 -0600 -@@ -14,7 +14,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src - -I$(top_builddir)/mfhdf/libsrc -I$(top_srcdir)/java/src/jni $(JNIFLAGS) +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 +@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src + $(JNIFLAGS) $(XDRINC) # This is our main target -lib_LTLIBRARIES=libhdf_java.la @@ -27,9 +27,9 @@ diff -up hdf-4.2.14/java/src/jni/Makefile.am.build hdf-4.2.14/java/src/jni/Makef # Source files for the library libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \ -diff -up hdf-4.2.14/java/src/Makefile.am.build hdf-4.2.14/java/src/Makefile.am ---- hdf-4.2.14/java/src/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600 -+++ hdf-4.2.14/java/src/Makefile.am 2019-04-10 20:01:42.336828053 -0600 +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 @@ -13,8 +13,8 @@ JAVAROOT = .classes classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) @@ -40,12 +40,12 @@ diff -up hdf-4.2.14/java/src/Makefile.am.build hdf-4.2.14/java/src/Makefile.am +hdf_javadir = $(prefix)/lib/java pkgpath = hdf/hdflib - CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$$CLASSPATH -diff -up hdf-4.2.14/java/test/junit.sh.in.build hdf-4.2.14/java/test/junit.sh.in ---- hdf-4.2.14/java/test/junit.sh.in.build 2018-06-26 22:42:58.000000000 -0600 -+++ hdf-4.2.14/java/test/junit.sh.in 2019-04-10 20:01:42.337828056 -0600 + 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 @@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" - BLDLIBDIR="$top_builddir/java/lib" + BLDLIBDIR="$top_builddir/hdf4/lib" BLDDIR="." HDFTEST_HOME="$top_srcdir/java/test" -JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar @@ -53,15 +53,15 @@ diff -up hdf-4.2.14/java/test/junit.sh.in.build hdf-4.2.14/java/test/junit.sh.in TESTJARFILE=jar@PACKAGE_TARNAME@test.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -diff -up hdf-4.2.14/java/test/Makefile.am.build hdf-4.2.14/java/test/Makefile.am ---- hdf-4.2.14/java/test/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600 -+++ hdf-4.2.14/java/test/Makefile.am 2019-04-10 20:01:42.337828056 -0600 +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 @@ -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.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.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.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)test.jar diff --git a/hdf-ppc.patch b/hdf-ppc.patch index 87360fe..039f876 100644 --- a/hdf-ppc.patch +++ b/hdf-ppc.patch @@ -1,6 +1,6 @@ -diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc hdf-4.2.10/hdf/src/hdfi.h ---- hdf-4.2.10/hdf/src/hdfi.h.ppc 2014-02-09 19:28:49.000000000 -0700 -+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-14 09:14:52.564082472 -0700 +diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc hdf-4.2.15/hdf/src/hdfi.h +--- hdf-4.2.15/hdf/src/hdfi.h.ppc 2020-03-03 10:40:50.000000000 -0700 ++++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:04:01.529561298 -0600 @@ -75,6 +75,7 @@ #define DFMT_IA64 0x4441 #define DFMT_LINUX64 0x4441 @@ -9,7 +9,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc hdf-4.2.10/hdf/src/hdfi.h /* I/O library constants */ #define UNIXUNBUFIO 1 -@@ -1013,6 +1014,57 @@ typedef long hdf_pint_t; +@@ -1017,6 +1018,57 @@ typedef long hdf_pint_t; #endif /*Linux 64 */ @@ -67,21 +67,21 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc hdf-4.2.10/hdf/src/hdfi.h /*-----------------------------------------------------*/ /* 64-bit Free BSD */ -diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.10/mfhdf/fortran/jackets.c.in ---- hdf-4.2.10/mfhdf/fortran/jackets.c.in.ppc 2014-02-09 19:28:44.000000000 -0700 -+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in 2014-02-14 09:18:29.860919811 -0700 +diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.15/mfhdf/fortran/jackets.c.in +--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc 2020-03-03 10:40:50.000000000 -0700 ++++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:06:39.500403641 -0600 @@ -34,7 +34,7 @@ - struct ncfils { /* This will be a common block from Fortran */ + struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ int ll; #else long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm +@@ -65,7 +65,7 @@ struct ncfils { /* This will - struct ncfils { /* This will be a common block from Fortran */ + struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ @@ -98,92 +98,92 @@ diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.10/mfhdf/fortran/jack * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL @@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; + long longs = *(int *)value; @@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); + long *longs = itol (value, ncount, ndims); @@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); + tmpbasis = nctypelen(NC_LONG); else #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ if (datatype == NC_LONG) - tmpbasis = sizeof(int); + tmpbasis = sizeof(int); else @@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); + long *longs = itolg (value, ncount, nbasis, ndims); @@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; + long longs; @@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); + tmpbasis = nctypelen(NC_LONG); else #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ if (datatype == NC_LONG) - tmpbasis = sizeof(int); + tmpbasis = sizeof(int); else @@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); + long *longs = itol (value, attlen, 1); @@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes diff --git a/hdf-ppc64le.patch b/hdf-ppc64le.patch index bf71a8b..e199a55 100644 --- a/hdf-ppc64le.patch +++ b/hdf-ppc64le.patch @@ -1,6 +1,6 @@ -diff -up hdf-4.2.10/hdf/src/hconv.h.ppc64le hdf-4.2.10/hdf/src/hconv.h ---- hdf-4.2.10/hdf/src/hconv.h.ppc64le 2014-09-03 20:30:36.598974138 -0600 -+++ hdf-4.2.10/hdf/src/hconv.h 2014-09-03 20:30:36.608974327 -0600 +diff -up hdf-4.2.15/hdf/src/hconv.h.ppc64le hdf-4.2.15/hdf/src/hconv.h +--- hdf-4.2.15/hdf/src/hconv.h.ppc64le 2020-04-30 21:25:25.183973672 -0600 ++++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:25:25.191973677 -0600 @@ -59,7 +59,7 @@ /* CONSTANT DEFINITIONS */ /*****************************************************************************/ @@ -10,9 +10,9 @@ diff -up hdf-4.2.10/hdf/src/hconv.h.ppc64le hdf-4.2.10/hdf/src/hconv.h # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ # define UI8_OUT DFKnb1b # define SI16_IN DFKnb2b /* S = Signed */ -diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h ---- hdf-4.2.10/hdf/src/hdfi.h.ppc64le 2014-09-03 20:30:36.599974157 -0600 -+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-09 19:28:49.000000000 -0700 +diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc64le hdf-4.2.15/hdf/src/hdfi.h +--- hdf-4.2.15/hdf/src/hdfi.h.ppc64le 2020-04-30 21:25:25.183973672 -0600 ++++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:25:25.192973677 -0600 @@ -75,6 +75,7 @@ #define DFMT_IA64 0x4441 #define DFMT_LINUX64 0x4441 @@ -21,7 +21,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h #define DFMT_LINUXPPC 0x1111 #define DFMT_LINUXSPARC 0x1111 #define DFMT_LINUX390 0x1111 -@@ -922,18 +923,24 @@ typedef int hdf_pint_t; +@@ -926,18 +927,24 @@ typedef int hdf_pint_t; /*-----------------------------------------------------*/ @@ -49,7 +49,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h typedef void VOID; typedef void *VOIDP; typedef char *_fcd; -@@ -969,8 +976,9 @@ typedef long hdf_pint_t; +@@ -973,8 +980,9 @@ typedef long hdf_pint_t; #define INCLUDES_ARE_ANSI #endif @@ -60,18 +60,19 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h /* Linux 64 */ #if defined(__linux__) && defined __x86_64__ && !(defined SUN) /* i.e. 64-bit Linux but not SunOS on Intel */ ---- hdf-4.2.10/mfhdf/libsrc/xdrposix.c.patched -+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c -@@ -431,7 +431,7 @@ xdrposix_getlong(xdrs, lp) - #endif +diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le hdf-4.2.15/mfhdf/libsrc/xdrposix.c +--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le 2020-04-30 21:25:25.186973674 -0600 ++++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:26:18.190001127 -0600 +@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp) + long *lp; { unsigned char *up = (unsigned char *)lp ; --#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) +-#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) ++#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) *lp = 0 ; up += (sizeof(long) - 4) ; #endif -@@ -458,7 +458,7 @@ xdrposix_putlong(xdrs, lp) +@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp) netlong mycopy = htonl(*lp); up = (unsigned char *)&mycopy; #endif @@ -79,3 +80,4 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h +#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) up += (sizeof(long) - 4) ; #endif + diff --git a/hdf-s390.patch b/hdf-s390.patch index 7593dd7..ea21e03 100644 --- a/hdf-s390.patch +++ b/hdf-s390.patch @@ -1,6 +1,6 @@ -diff -up hdf-4.2.10/hdf/src/hdfi.h.s390 hdf-4.2.10/hdf/src/hdfi.h ---- hdf-4.2.10/hdf/src/hdfi.h.s390 2014-02-14 09:20:40.521202091 -0700 -+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-14 09:20:40.525202067 -0700 +diff -up hdf-4.2.15/hdf/src/hdfi.h.s390 hdf-4.2.15/hdf/src/hdfi.h +--- hdf-4.2.15/hdf/src/hdfi.h.s390 2020-04-30 21:07:16.946922845 -0600 ++++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:07:16.950922901 -0600 @@ -77,6 +77,7 @@ #define DFMT_POWERPC64 0x1111 #define DFMT_LINUXPPC 0x1111 @@ -9,7 +9,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.s390 hdf-4.2.10/hdf/src/hdfi.h /* I/O library constants */ #define UNIXUNBUFIO 1 -@@ -1126,6 +1127,66 @@ typedef int hdf_pint_t; +@@ -1130,6 +1131,66 @@ typedef int hdf_pint_t; #endif /* Linux Sparc32/64 */ @@ -76,21 +76,21 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.s390 hdf-4.2.10/hdf/src/hdfi.h /*-----------------------------------------------------*/ /* 64-bit Free BSD */ -diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.10/mfhdf/fortran/jackets.c.in ---- hdf-4.2.10/mfhdf/fortran/jackets.c.in.s390 2014-02-14 09:20:40.518202109 -0700 -+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in 2014-02-14 09:23:08.002375061 -0700 +diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.15/mfhdf/fortran/jackets.c.in +--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 2020-04-30 21:07:16.942922790 -0600 ++++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:10:30.030640644 -0600 @@ -34,7 +34,7 @@ - struct ncfils { /* This will be a common block from Fortran */ + struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ int ll; #else long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm +@@ -65,7 +65,7 @@ struct ncfils { /* This will - struct ncfils { /* This will be a common block from Fortran */ + struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ @@ -107,124 +107,102 @@ diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.10/mfhdf/fortran/jac * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL @@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; + long longs = *(int *)value; @@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); + long *longs = itol (value, ncount, ndims); @@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); + tmpbasis = nctypelen(NC_LONG); else #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ if (datatype == NC_LONG) - tmpbasis = sizeof(int); + tmpbasis = sizeof(int); else @@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); + long *longs = itolg (value, ncount, nbasis, ndims); @@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; + long longs; @@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); + tmpbasis = nctypelen(NC_LONG); else #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ if (datatype == NC_LONG) - tmpbasis = sizeof(int); + tmpbasis = sizeof(int); else @@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); + long *longs = itol (value, attlen, 1); @@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return; + } /* else */ + #endif /* FORTRAN_HAS_NO_SHORT */ +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -up hdf-4.2.10/mfhdf/libsrc/array.c.s390 hdf-4.2.10/mfhdf/libsrc/array.c ---- hdf-4.2.10/mfhdf/libsrc/array.c.s390 2014-02-14 09:20:50.693141452 -0700 -+++ hdf-4.2.10/mfhdf/libsrc/array.c 2014-02-14 09:26:40.897231851 -0700 -@@ -620,7 +620,7 @@ xdr_NC_array(xdrs, app) - xdr_NC_fnct = xdr_shorts ; - goto func ; - case NC_LONG : --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff -up hdf-4.2.10/mfhdf/libsrc/cdf.c.s390 hdf-4.2.10/mfhdf/libsrc/cdf.c ---- hdf-4.2.10/mfhdf/libsrc/cdf.c.s390 2014-02-14 09:20:50.694141447 -0700 -+++ hdf-4.2.10/mfhdf/libsrc/cdf.c 2014-02-14 09:27:33.826948531 -0700 -@@ -3662,7 +3662,7 @@ NC_var *vp ; - break ; - case NC_LONG : - alen /= 4 ; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff -up hdf-4.2.10/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.10/mfhdf/libsrc/netcdf.h.in ---- hdf-4.2.10/mfhdf/libsrc/netcdf.h.in.s390 2014-02-14 09:20:51.260138101 -0700 -+++ hdf-4.2.10/mfhdf/libsrc/netcdf.h.in 2014-02-14 09:27:06.286095942 -0700 +diff -up hdf-4.2.15/mfhdf/libsrc/array.c.s390 hdf-4.2.15/mfhdf/libsrc/array.c +diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.s390 hdf-4.2.15/mfhdf/libsrc/cdf.c +diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in +--- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 2020-04-30 21:07:16.957922998 -0600 ++++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:15:23.731467288 -0600 @@ -293,7 +293,7 @@ typedef double ncdouble; - /* + /* * Variables/attributes of type NC_LONG should use the C type 'nclong' */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ @@ -232,31 +210,22 @@ diff -up hdf-4.2.10/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.10/mfhdf/libsrc/netcdf /* * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. * http://www.unix.org/version2/whatsnew/lp64_wp.html -diff -up hdf-4.2.10/mfhdf/libsrc/putget.c.s390 hdf-4.2.10/mfhdf/libsrc/putget.c ---- hdf-4.2.10/mfhdf/libsrc/putget.c.s390 2014-02-14 09:20:51.261138095 -0700 -+++ hdf-4.2.10/mfhdf/libsrc/putget.c 2014-02-14 09:24:03.676074745 -0700 -@@ -664,7 +664,7 @@ Void *values ; - case NC_SHORT : - return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; - case NC_LONG : --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - return( xdr_int(xdrs, (nclong *)values) ) ; +diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.s390 hdf-4.2.15/mfhdf/libsrc/putget.c +--- hdf-4.2.15/mfhdf/libsrc/putget.c.s390 2020-04-30 21:07:16.959923025 -0600 ++++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:12:13.612268179 -0600 +@@ -665,7 +665,7 @@ Void *values ; + case NC_SHORT : + return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; + case NC_LONG : +-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + return( xdr_int(xdrs, (nclong *)values) ) ; #else - return( xdr_long(xdrs, (nclong *)values) ) ; -@@ -1975,7 +1975,7 @@ Void *values ; - } /* else */ - return(TRUE) ; - case NC_LONG : --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 2014-02-09 19:28:45.000000000 -0700 -+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c 2014-02-14 09:26:17.898354986 -0700 -@@ -250,7 +250,7 @@ int nbytes; + return( xdr_long(xdrs, (nclong *)values) ) ; +diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.15/mfhdf/libsrc/xdrposix.c +--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 2020-03-03 10:40:50.000000000 -0700 ++++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:14:47.574557550 -0600 +@@ -262,7 +262,7 @@ int nbytes; static bool_t xdrposix_getlong(); static bool_t xdrposix_putlong(); @@ -265,7 +234,7 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi static bool_t xdrposix_getint(); static bool_t xdrposix_putint(); #endif -@@ -264,7 +264,7 @@ static long * xdrposix_inline(); +@@ -276,7 +276,7 @@ static long * xdrposix_inline(); #if (defined __sun && defined _LP64) static rpc_inline_t * xdrposix_inline(); #else @@ -273,8 +242,8 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi +#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ static int32_t * xdrposix_inline(); #else - #if (defined __alpha ) -@@ -294,9 +294,9 @@ static struct xdr_ops xdrposix_ops = { + static netlong * xdrposix_inline(); +@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = { xdrposix_getpos, /* get offset in the stream */ xdrposix_setpos, /* set offset in the stream */ xdrposix_inline, /* prime stream for inline macros */ @@ -282,20 +251,20 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi +#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ xdrposix_destroy, /* destroy stream */ -#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ ++#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ NULL, /* no xdr_control function defined */ - #endif - /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ -@@ -431,7 +431,7 @@ xdrposix_getlong(xdrs, lp) #endif + /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ +@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp) + long *lp; { unsigned char *up = (unsigned char *)lp ; --#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) +-#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__)) ++#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) *lp = 0 ; up += (sizeof(long) - 4) ; #endif -@@ -458,7 +458,7 @@ xdrposix_putlong(xdrs, lp) +@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp) netlong mycopy = htonl(*lp); up = (unsigned char *)&mycopy; #endif @@ -304,16 +273,16 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi up += (sizeof(long) - 4) ; #endif -@@ -552,7 +552,7 @@ static rpc_inline_t * - #if (defined __alpha) - static int* +@@ -560,7 +560,7 @@ static long * + #if (defined __sun && defined _LP64) + static rpc_inline_t * #else -#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ +#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ - static int32_t * + static int32_t * #else - static netlong * -@@ -580,7 +580,7 @@ int + static netlong * +@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len) return (NULL); } @@ -322,27 +291,27 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi static bool_t xdrposix_getint(xdrs, lp) -diff -up hdf-4.2.10/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.10/mfhdf/ncgen/ncgen.l ---- hdf-4.2.10/mfhdf/ncgen/ncgen.l.s390 2014-02-14 09:20:51.262138089 -0700 -+++ hdf-4.2.10/mfhdf/ncgen/ncgen.l 2014-02-14 09:27:53.015845830 -0700 -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss - yyerror(errstr); - } +diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.15/mfhdf/ncgen/ncgen.l +--- hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 2020-04-30 21:07:16.961923053 -0600 ++++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:08:10.175628593 -0600 +@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m + yyerror(errstr); + } -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ - if (dd < INT_MIN || dd > INT_MAX) + if (dd < INT_MIN || dd > INT_MAX) #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff -up hdf-4.2.10/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.10/mfhdf/ncgen/ncgenyy.c ---- hdf-4.2.10/mfhdf/ncgen/ncgenyy.c.s390 2014-05-22 08:33:21.700132543 -0400 -+++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c 2014-05-22 08:33:50.990132543 -0400 -@@ -989,7 +989,7 @@ YY_RULE_SETUP - yyerror(errstr); - } + if (dd < LONG_MIN || dd > LONG_MAX) +diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c +--- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 2020-04-30 21:07:16.963923081 -0600 ++++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:08:53.818030313 -0600 +@@ -991,7 +991,7 @@ YY_RULE_SETUP + yyerror(errstr); + } -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ - if (dd < INT_MIN || dd > INT_MAX) + if (dd < INT_MIN || dd > INT_MAX) #else - if (dd < LONG_MIN || dd > LONG_MAX) + if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/hdf.spec b/hdf.spec index e411ffe..2f9b830 100644 --- a/hdf.spec +++ b/hdf.spec @@ -3,8 +3,8 @@ %endif Name: hdf -Version: 4.2.14 -Release: 9%{?dist} +Version: 4.2.15 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -20,7 +20,7 @@ Patch5: hdf-destdir.patch # Install examples into the right location Patch6: hdf-examplesdir.patch # Add AArch64 definitions -Patch8: hdf-4.2.10-aarch64.patch +Patch8: hdf-aarch64.patch # ppc64le support # https://bugzilla.redhat.com/show_bug.cgi?id=1134385 Patch9: hdf-ppc64le.patch @@ -95,7 +95,7 @@ HDF4 java library %prep %setup -q -%patch0 -p1 -b .maxavailfiles +#patch0 -p1 -b .maxavailfiles %patch1 -p1 -b .ppc %patch2 -p1 -b .sparc %patch3 -p1 -b .s390 @@ -110,9 +110,9 @@ HDF4 java library find -name \*.jar -delete ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar ln -s %{_javadir}/junit.jar java/lib/junit.jar -ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.5.jar -ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.5.jar -ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.5.jar +ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar +ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar +ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar # Fix test output junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) @@ -260,6 +260,9 @@ make -j1 -C build-static check %changelog +* Fri May 01 2020 Orion Poplawski - 4.2.15-1 +- Update to 4.2.15 + * Thu Apr 02 2020 Björn Esser - 4.2.14-9 - Fix string quoting for rpm >= 4.16 diff --git a/sources b/sources index 89a96ac..83abd7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hdf-4.2.14.tar.bz2) = 5689525e18bfc6be205a0a21cded68d66630020c9a1445ce5afae41d58246e26ed9ba349da1bb197c31557aba127f51a2b697a868ec7e2747ac6153858171718 +SHA512 (hdf-4.2.15.tar.bz2) = 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9 From f83322e16529e09f9c9f5124cb368157a3c64beb Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 20:48:00 +0200 Subject: [PATCH 09/40] Rebuilt for JDK-11 --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 2f9b830..f2a405c 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -260,6 +260,9 @@ make -j1 -C build-static check %changelog +* Fri Jul 10 2020 Jiri Vanek - 4.2.15-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri May 01 2020 Orion Poplawski - 4.2.15-1 - Update to 4.2.15 From ca49a5638b1c2958dcaff433728dd27eadb8a9e3 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 21 Jul 2020 16:25:12 -0500 Subject: [PATCH 10/40] Minor conditional fix for ELN Signed-off-by: Merlin Mathesius --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index f2a405c..6336f56 100644 --- a/hdf.spec +++ b/hdf.spec @@ -158,7 +158,7 @@ cd build-static # Java requires shared libraries, fortran requires static # Temporary workaround for compiling on GCC-10 -%if 0%{?fedora} && 0%{?fedora} > 31 +%if (0%{?fedora} && 0%{?fedora} > 31) || (0%{?rhel} && 0%{?rhel} > 8) export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" export FFLAGS="%{build_fflags} -fallow-argument-mismatch" %endif @@ -260,6 +260,9 @@ make -j1 -C build-static check %changelog +* Tue Jul 21 2020 Merlin Mathesius - 4.2.15-2 +- Minor conditional fix for ELN + * Fri Jul 10 2020 Jiri Vanek - 4.2.15-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 71d623dbfa031f6a22c3225da57353c06434043d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 11 Jul 2020 18:22:01 -0600 Subject: [PATCH 11/40] GCC 10 workaround needed for RHEL > 8 as well --- hdf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 6336f56..9c005b3 100644 --- a/hdf.spec +++ b/hdf.spec @@ -158,7 +158,7 @@ cd build-static # Java requires shared libraries, fortran requires static # Temporary workaround for compiling on GCC-10 -%if (0%{?fedora} && 0%{?fedora} > 31) || (0%{?rhel} && 0%{?rhel} > 8) +%if 0%{?fedora} > 31 || 0%{?rhel} > 8 export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" export FFLAGS="%{build_fflags} -fallow-argument-mismatch" %endif From ca5d64a2d2107d7f3537a47bbdbe415085c94655 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 00:48:26 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 9c005b3..ff8661e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -260,6 +260,9 @@ make -j1 -C build-static check %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 4.2.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 21 2020 Merlin Mathesius - 4.2.15-2 - Minor conditional fix for ELN From 3049ac4091a5f4a5c31e3a26807ea2e43c2a20c4 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:48:59 +0000 Subject: [PATCH 13/40] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From edbe5f49646b609f5bc9aeeee5a2be47e9556e8c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:23:26 +0000 Subject: [PATCH 14/40] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- hdf.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hdf.spec b/hdf.spec index ff8661e..f3f070e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -43,6 +43,7 @@ BuildRequires: javapackages-tools BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j +BuildRequires: make Requires: %{name}-libs%{?_isa} = %{version}-%{release} From b8d1f3a43a86f72e2741f6039ae44c62a08c1cda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:24:09 +0000 Subject: [PATCH 15/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index f3f070e..3435fd8 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -261,6 +261,9 @@ make -j1 -C build-static check %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.2.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 4.2.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8296ec0626d41c563b59a21d88738600dda8c3a0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 30 May 2021 14:12:55 -0600 Subject: [PATCH 16/40] Handle junit versions better --- hdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hdf.spec b/hdf.spec index 3435fd8..b7d0bf7 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -116,7 +116,7 @@ ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar # Fix test output -junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) +junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt ## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds @@ -261,6 +261,9 @@ make -j1 -C build-static check %changelog +* Sun May 30 2021 Orion Poplawski - 4.2.15-5 +- Handle junit versions better + * Tue Jan 26 2021 Fedora Release Engineering - 4.2.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d25c0ddcd0ba3ae9de7f9fa55dcfc9107d9c9ea6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:32:35 +0000 Subject: [PATCH 17/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index b7d0bf7..e358ffd 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -261,6 +261,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 4.2.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun May 30 2021 Orion Poplawski - 4.2.15-5 - Handle junit versions better From ddad9d77402bf4423ac1be278c290bfe38e71536 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 27 Jul 2021 17:20:25 +0200 Subject: [PATCH 18/40] Remove rpaths from public libraries --- hdf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index e358ffd..f238a71 100644 --- a/hdf.spec +++ b/hdf.spec @@ -179,7 +179,7 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 %install %make_install -C build-static %make_install -C build-shared -chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* || : +chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || : install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/ From 50f5ee142851e20b4d04a0fb53a664da574ccf95 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 27 Jul 2021 17:59:01 +0200 Subject: [PATCH 19/40] Add missing dependency (hamcrest-core) --- hdf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index f238a71..96ce410 100644 --- a/hdf.spec +++ b/hdf.spec @@ -40,7 +40,7 @@ BuildRequires: libtirpc-devel BuildRequires: gcc-gfortran, gcc BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: hamcrest +BuildRequires: hamcrest hamcrest-core BuildRequires: junit BuildRequires: slf4j BuildRequires: make From aed1f4ba8b9849fa597d68effe6983f432cb7ff2 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 27 Jul 2021 18:35:36 +0200 Subject: [PATCH 20/40] Undo latest commit| Modify symlink of java/lib/hamcrest-core.jar --- hdf.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 96ce410..a8d2ce0 100644 --- a/hdf.spec +++ b/hdf.spec @@ -40,7 +40,7 @@ BuildRequires: libtirpc-devel BuildRequires: gcc-gfortran, gcc BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: hamcrest hamcrest-core +BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j BuildRequires: make @@ -109,7 +109,12 @@ HDF4 java library # Replace jars with system versions find -name \*.jar -delete +# hamcrest-core is obsoleted in hamcrest-2.2 +%if 0%{?fedora} > 34 +ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar +%else ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar +%endif ln -s %{_javadir}/junit.jar java/lib/junit.jar ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar From c8ec4e6abb9aa9c9623db29c3b969d4517e7f037 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 28 Jul 2021 11:52:28 +0200 Subject: [PATCH 21/40] Use bundled junit| Fix hamcrest symlinks in Fedora 35+ --- hdf.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hdf.spec b/hdf.spec index a8d2ce0..1705188 100644 --- a/hdf.spec +++ b/hdf.spec @@ -108,21 +108,22 @@ HDF4 java library %patch11 -p1 -b .build # Replace jars with system versions -find -name \*.jar -delete # hamcrest-core is obsoleted in hamcrest-2.2 +# Junit tests are failing with junit-4.13.1 %if 0%{?fedora} > 34 +find . ! -name junit.jar -name "*.jar" -delete ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar %else +find . -name "*.jar" -delete ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar -%endif ln -s %{_javadir}/junit.jar java/lib/junit.jar -ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar -ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar -ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar - # Fix test output junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt +%endif +ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar +ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar +ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar ## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds # Use only if java is disabled @@ -266,8 +267,10 @@ make -j1 -C build-static check %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 4.2.15-6 +* Wed Jul 28 2021 Antonio Trande - 4.2.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +- Use bundled junit +- Fix hamcrest symlinks in Fedora 35+ * Sun May 30 2021 Orion Poplawski - 4.2.15-5 - Handle junit versions better From 3313aff0d37a3f7b858c67dc5210c90c7c36dfe8 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 29 Jul 2021 12:53:04 +0200 Subject: [PATCH 22/40] Fix eln builds --- hdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hdf.spec b/hdf.spec index 1705188..c21126a 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -110,7 +110,7 @@ HDF4 java library # Replace jars with system versions # hamcrest-core is obsoleted in hamcrest-2.2 # Junit tests are failing with junit-4.13.1 -%if 0%{?fedora} > 34 +%if 0%{?rhel} >= 9 || 0%{?fedora} > 34 find . ! -name junit.jar -name "*.jar" -delete ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar %else @@ -267,6 +267,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 29 2021 Antonio Trande - 4.2.15-7 +- Fix eln builds + * Wed Jul 28 2021 Antonio Trande - 4.2.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Use bundled junit From d051a6b402c4ed46113cfd1434144bc7bf78b998 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:15:20 +0000 Subject: [PATCH 23/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index c21126a..9b37dab 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -267,6 +267,9 @@ make -j1 -C build-static check %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.2.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 29 2021 Antonio Trande - 4.2.15-7 - Fix eln builds From 117cf570cff0f5197a57603b23caa0c3ad19925d Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:53:27 +0100 Subject: [PATCH 24/40] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 9b37dab..c65fd55 100644 --- a/hdf.spec +++ b/hdf.spec @@ -4,7 +4,7 @@ Name: hdf Version: 4.2.15 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -267,6 +267,9 @@ make -j1 -C build-static check %changelog +* Sat Feb 05 2022 Jiri Vanek - 4.2.15-9 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 4.2.15-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 83d25263531dfcf419522b0dfbc3421ca1e95488 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Jul 2022 11:36:11 -0600 Subject: [PATCH 25/40] Drop java for i686 (bz#2104047) --- hdf-avoid_syntax_error_el6.patch | 17 --------------- hdf.spec | 37 ++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 hdf-avoid_syntax_error_el6.patch diff --git a/hdf-avoid_syntax_error_el6.patch b/hdf-avoid_syntax_error_el6.patch deleted file mode 100644 index 772af9c..0000000 --- a/hdf-avoid_syntax_error_el6.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.orig.ac 2017-06-24 23:00:04.000000000 +0200 -+++ configure.ac 2017-07-21 22:13:19.695919835 +0200 -@@ -264,10 +264,10 @@ - JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR" - done - ## Find junit for testing the JNI code -- AX_CHECK_CLASSPATH() -- CLASSPATH_ENV=$H4_CLASSPATH -- AX_CHECK_JUNIT() -- AX_CHECK_JAVA_HOME -+ ## AX_CHECK_CLASSPATH() -+ ## CLASSPATH_ENV=$H4_CLASSPATH -+ ## AX_CHECK_JUNIT() -+ ## AX_CHECK_JAVA_HOME - - AC_MSG_RESULT([yes]) - else diff --git a/hdf.spec b/hdf.spec index c65fd55..e35570d 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,10 +1,13 @@ -%if 0%{?rhel} && 0%{?rhel} < 7 -%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +# No more Java on i686 +%ifarch %{java_arches} +%bcond_without java +%else +%bcond_with java %endif Name: hdf Version: 4.2.15 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -24,11 +27,6 @@ Patch8: hdf-aarch64.patch # ppc64le support # https://bugzilla.redhat.com/show_bug.cgi?id=1134385 Patch9: hdf-ppc64le.patch - -# Fix syntax error on epel6 builds -# Use only if java is disabled -Patch10: hdf-avoid_syntax_error_el6.patch - # Fix java build Patch11: hdf-build.patch @@ -38,8 +36,12 @@ BuildRequires: chrpath BuildRequires: flex byacc libjpeg-devel zlib-devel %{!?el6:libaec-devel} BuildRequires: libtirpc-devel BuildRequires: gcc-gfortran, gcc +%if %{with java} BuildRequires: java-devel BuildRequires: javapackages-tools +%else +Obsoletes: java-hdf < %{version}-%{release} +%endif BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j @@ -84,6 +86,7 @@ Requires: %{name}-devel = %{version}-%{release} HDF4 static libraries. +%if %{with java} %package -n java-hdf Summary: HDF4 java library Requires: slf4j @@ -91,6 +94,7 @@ Obsoletes: jhdf < 3.3.1-2 %description -n java-hdf HDF4 java library +%endif %prep @@ -107,10 +111,11 @@ HDF4 java library %patch9 -p1 -b .ppc64le %patch11 -p1 -b .build +%if %{with java} # Replace jars with system versions # hamcrest-core is obsoleted in hamcrest-2.2 # Junit tests are failing with junit-4.13.1 -%if 0%{?rhel} >= 9 || 0%{?fedora} > 34 +%if 0%{?rhel} >= 9 || 0%{?fedora} find . ! -name junit.jar -name "*.jar" -delete ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar %else @@ -124,11 +129,6 @@ sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUn ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar - -## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds -# Use only if java is disabled -%if 0%{?rhel} && 0%{?rhel} < 7 -%patch10 -p0 %endif find . -type f -name "*.h" -exec chmod 0644 '{}' \; @@ -155,7 +155,7 @@ export LIBS="-ltirpc" mkdir -p build-shared/java/lib cd build-shared # Java requires shared libraries, fortran requires static -%configure --disable-production --enable-java --disable-netcdf \ +%configure --disable-production %{?with_java:--enable-java} --disable-netcdf \ --enable-shared=yes --enable-static=no --disable-fortran %{!?el6:--with-szlib} \ --includedir=%{_includedir}/%{name} %make_build @@ -165,7 +165,7 @@ cd build-static # Java requires shared libraries, fortran requires static # Temporary workaround for compiling on GCC-10 -%if 0%{?fedora} > 31 || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} > 8 export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" export FFLAGS="%{build_fflags} -fallow-argument-mismatch" %endif @@ -261,12 +261,17 @@ make -j1 -C build-static check %files static %{_libdir}/*.a +%if %{with java} %files -n java-hdf %{_jnidir}/hdf.jar %{_libdir}/%{name}/libhdf_java.so +%endif %changelog +* Sun Jul 10 2022 Orion Poplawski - 4.2.15-10 +- Drop java for i686 (bz#2104047) + * Sat Feb 05 2022 Jiri Vanek - 4.2.15-9 - Rebuilt for java-17-openjdk as system jdk From 0678602e77b4725a09fe61dda50943139dd08c8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:32:40 +0000 Subject: [PATCH 26/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index e35570d..0d16a71 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.15 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -269,6 +269,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.2.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jul 10 2022 Orion Poplawski - 4.2.15-10 - Drop java for i686 (bz#2104047) From 218d813b8156bd20b54cd933a3b2cd14fb630550 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 11 Oct 2022 19:00:35 +0000 Subject: [PATCH 27/40] Move all java buildrequires to java section hamcrest, junit and slf4j are all java binaries that are pulling in openjdk. The only reason this is building on i686 is because there is an old openjdk tagged into the buildroot. Moving them up to the java section before this bites us. --- hdf.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hdf.spec b/hdf.spec index 0d16a71..48fb199 100644 --- a/hdf.spec +++ b/hdf.spec @@ -39,12 +39,12 @@ BuildRequires: gcc-gfortran, gcc %if %{with java} BuildRequires: java-devel BuildRequires: javapackages-tools -%else -Obsoletes: java-hdf < %{version}-%{release} -%endif BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j +%else +Obsoletes: java-hdf < %{version}-%{release} +%endif BuildRequires: make Requires: %{name}-libs%{?_isa} = %{version}-%{release} From d6b93629222f43c9a3ba27816391660c43fad7d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 12:02:50 +0000 Subject: [PATCH 28/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 48fb199..9ea72e5 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.15 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -269,6 +269,9 @@ make -j1 -C build-static check %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.2.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 4.2.15-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From dbb5659e73dec8aa7e9d4e9374819dc70f5b8801 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:11:06 +0000 Subject: [PATCH 29/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 9ea72e5..6d5b326 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.15 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -269,6 +269,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 4.2.15-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 4.2.15-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e557ba533f94d39743d19b693a48288ece2e98ff Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 29 Aug 2023 15:05:04 +0200 Subject: [PATCH 30/40] Set build_type_safety_c to 0 (#2167466) Related to: --- hdf.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 6d5b326..3d399bc 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.15 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -139,6 +139,9 @@ touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h %build +# This should be removed once rebased to an upstream version with +# C99 compatibility fixes (bug 2167466). +%global build_type_safety_c 0 # For destdir/examplesdir patches autoreconf -vif @@ -269,6 +272,9 @@ make -j1 -C build-static check %changelog +* Tue Aug 29 2023 Florian Weimer - 4.2.15-14 +- Set build_type_safety_c to 0 (#2167466) + * Thu Jul 20 2023 Fedora Release Engineering - 4.2.15-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d9447840f4d81f1724b46e6534e521306a5194f5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 4 Sep 2023 08:21:08 -0400 Subject: [PATCH 31/40] Fix flatpak build Installation path macros cannot be reliably used to define the location of build dependencies, as they may not be in the same prefix if they are part of the runtime or are buildroot only. --- hdf.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hdf.spec b/hdf.spec index 3d399bc..11bdeda 100644 --- a/hdf.spec +++ b/hdf.spec @@ -117,18 +117,18 @@ HDF4 java library # Junit tests are failing with junit-4.13.1 %if 0%{?rhel} >= 9 || 0%{?fedora} find . ! -name junit.jar -name "*.jar" -delete -ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar +ln -s $(build-classpath hamcrest) java/lib/hamcrest-core.jar %else find . -name "*.jar" -delete -ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar -ln -s %{_javadir}/junit.jar java/lib/junit.jar +ln -s $(build-classpath hamcrest/core) java/lib/hamcrest-core.jar +ln -s $(build-classpath junit) java/lib/junit.jar # Fix test output junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt %endif -ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar -ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar -ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar +ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-1.7.25.jar +ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-1.7.25.jar +ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-1.7.25.jar %endif find . -type f -name "*.h" -exec chmod 0644 '{}' \; @@ -151,7 +151,7 @@ rm config/*linux-gnu # TODO: upstream fix # libmfhdf.so is link to libdf.so -export CFLAGS="%{optflags} -I%{_includedir}/tirpc" +export CFLAGS="%{optflags} -I%{_usr}/include/tirpc" export LIBS="-ltirpc" %global _configure ../configure # Java test needs this but doesn't create it From abf86ddc8846843ff184093b5e124093ef4eed6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 22:00:29 +0000 Subject: [PATCH 32/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 11bdeda..de54738 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.15 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -272,6 +272,9 @@ make -j1 -C build-static check %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 4.2.15-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Aug 29 2023 Florian Weimer - 4.2.15-14 - Set build_type_safety_c to 0 (#2167466) From 867afa231460a9af48b1de7763fc79044a81e45c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:34:21 +0000 Subject: [PATCH 33/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index de54738..81adb6f 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.15 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -272,6 +272,9 @@ make -j1 -C build-static check %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 4.2.15-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 4.2.15-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 90451b1c3cdc43ce90d574efdc8ab2355f1e92e5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Jan 2024 20:50:05 -0700 Subject: [PATCH 34/40] Update to 4.2.16-2 --- .gitignore | 1 + hdf-4.2.4-sparc.patch | 78 --------- hdf-4.2.5-maxavailfiles.patch | 11 -- hdf-aarch64.patch | 289 ------------------------------- hdf-arm.patch | 81 --------- hdf-build.patch | 36 ++-- hdf-ppc.patch | 189 -------------------- hdf-s390.patch | 317 ---------------------------------- hdf-type.patch | 12 ++ hdf.spec | 74 +++----- sources | 2 +- 11 files changed, 58 insertions(+), 1032 deletions(-) delete mode 100644 hdf-4.2.4-sparc.patch delete mode 100644 hdf-4.2.5-maxavailfiles.patch delete mode 100644 hdf-aarch64.patch delete mode 100644 hdf-arm.patch delete mode 100644 hdf-ppc.patch delete mode 100644 hdf-s390.patch create mode 100644 hdf-type.patch diff --git a/.gitignore b/.gitignore index 5b1976d..f989858 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ hdf-4.2.5.tar.bz2 /hdf-4.2.13.tar.bz2 /hdf-4.2.14.tar.bz2 /hdf-4.2.15.tar.bz2 +/hdf-4.2.16-2.tar.bz2 diff --git a/hdf-4.2.4-sparc.patch b/hdf-4.2.4-sparc.patch deleted file mode 100644 index 38d4fd4..0000000 --- a/hdf-4.2.4-sparc.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc hdf-4.2.4-snap8/hdf/src/hdfi.h ---- hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc 2010-02-01 13:28:25.361387271 -0700 -+++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:31:46.343387138 -0700 -@@ -77,6 +77,7 @@ - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 - #define DFMT_LINUXPPC 0x1111 -+#define DFMT_LINUXSPARC 0x1111 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1392,6 +1393,66 @@ typedef long hdf_pint_t; - - #endif /*Linux PPC */ - -+/* Linux Sparc32/64 */ -+#if defined __sparc__ || defined __sparc64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXPPC -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+#ifdef _LP64 /* 64-bit environment */ -+typedef int int32; -+typedef unsigned int uint32; -+#else /* 32-bit environment */ -+typedef long int int32; -+typedef unsigned long int uint32; -+#endif -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+#ifdef _LP64 /* 64-bit environment */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#else /* 32-bit environment */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#endif -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /* Linux Sparc32/64 */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - diff --git a/hdf-4.2.5-maxavailfiles.patch b/hdf-4.2.5-maxavailfiles.patch deleted file mode 100644 index a06481d..0000000 --- a/hdf-4.2.5-maxavailfiles.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hdf-4.2.5-pre1/mfhdf/libsrc/file.c.maxavailfiles 2010-02-06 10:40:42.000000000 -0700 -+++ hdf-4.2.5-pre1/mfhdf/libsrc/file.c 2010-02-09 13:53:09.600285597 -0700 -@@ -51,7 +51,7 @@ - be in hlimits.h file in the future. EIP 2010-02-01*/ - - #define H4_MAX_AVAIL_OPENFILES 20000 --#define MAX_AVAIL_OPENFILES (((MAX_SYS_OPENFILES - 3) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 3)) -+#define MAX_AVAIL_OPENFILES (((MAX_SYS_OPENFILES - 10) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 10)) - - static int _curr_opened = 0 ; /* the number of files currently opened */ - /* NOTE: _ncdf might have been the number of files currently opened, yet it diff --git a/hdf-aarch64.patch b/hdf-aarch64.patch deleted file mode 100644 index 1865e72..0000000 --- a/hdf-aarch64.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hconv.h.aarch64 hdf-4.2.15/hdf/src/hconv.h ---- hdf-4.2.15/hdf/src/hconv.h.aarch64 2020-04-30 21:16:25.325499508 -0600 -+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:16:25.338499580 -0600 -@@ -59,7 +59,7 @@ - /* CONSTANT DEFINITIONS */ - /*****************************************************************************/ - /* Generally Big-Endian machines */ --#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) -+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ -diff -up hdf-4.2.15/hdf/src/hdfi.h.aarch64 hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.aarch64 2020-04-30 21:16:25.326499514 -0600 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:16:25.340499591 -0600 -@@ -79,6 +79,7 @@ - #define DFMT_LINUXSPARC 0x1111 - #define DFMT_LINUX390 0x1111 - #define DFMT_LINUXARM 0x4441 -+#define DFMT_LINUXAARCH64 0x4441 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1341,6 +1342,44 @@ typedef long hdf_pint_t; - - #endif /* IA64 */ - -+/* Linux AArch64 */ -+#if defined __aarch64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXAARCH64 -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+#endif /* Linux AArch64 */ -+ - #ifndef GOT_MACHINE - No machine type has been defined. Your Makefile needs to have someing like - -DSUN or -DUNICOS in order for the HDF internal structures to be defined -diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 hdf-4.2.15/mfhdf/fortran/jackets.c.in ---- hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 2020-04-30 21:16:25.318499470 -0600 -+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:20:28.346831868 -0600 -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -up hdf-4.2.15/mfhdf/libsrc/array.c.aarch64 hdf-4.2.15/mfhdf/libsrc/array.c -diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.aarch64 hdf-4.2.15/mfhdf/libsrc/cdf.c -diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in ---- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 2020-04-30 21:16:25.347499629 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:24:11.366838259 -0600 -@@ -293,7 +293,7 @@ typedef double ncdouble; - /* - * Variables/attributes of type NC_LONG should use the C type 'nclong' - */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - /* - * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. - * http://www.unix.org/version2/whatsnew/lp64_wp.html -diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 hdf-4.2.15/mfhdf/libsrc/putget.c ---- hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 2020-04-30 21:16:25.349499640 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:21:11.344052951 -0600 -@@ -665,7 +665,7 @@ Void *values ; - case NC_SHORT : - return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; - case NC_LONG : --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - return( xdr_int(xdrs, (nclong *)values) ) ; - #else - return( xdr_long(xdrs, (nclong *)values) ) ; -diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 hdf-4.2.15/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 2020-04-30 21:16:25.321499486 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:23:48.397752506 -0600 -@@ -262,7 +262,7 @@ int nbytes; - - static bool_t xdrposix_getlong(); - static bool_t xdrposix_putlong(); --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -276,7 +276,7 @@ static long * xdrposix_inline(); - #if (defined __sun && defined _LP64) - static rpc_inline_t * xdrposix_inline(); - #else --#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ -+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static int32_t * xdrposix_inline(); - #else - static netlong * xdrposix_inline(); -@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = { - xdrposix_getpos, /* get offset in the stream */ - xdrposix_setpos, /* set offset in the stream */ - xdrposix_inline, /* prime stream for inline macros */ --#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - xdrposix_destroy, /* destroy stream */ --#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) && !(defined __aarch64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ - NULL, /* no xdr_control function defined */ - #endif - /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ -@@ -560,7 +560,7 @@ static long * - #if (defined __sun && defined _LP64) - static rpc_inline_t * - #else --#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ -+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static int32_t * - #else - static netlong * -@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len) - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - - static bool_t - xdrposix_getint(xdrs, lp) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgen.l ---- hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 2020-04-30 21:16:25.376499789 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:17:29.876854089 -0600 -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c ---- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 2020-04-30 21:16:25.382499822 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:18:12.880090311 -0600 -@@ -991,7 +991,7 @@ YY_RULE_SETUP - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || defined __aarch64__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/hdf-arm.patch b/hdf-arm.patch deleted file mode 100644 index 2e63af1..0000000 --- a/hdf-arm.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up hdf-4.2.10/hdf/src/hconv.h.arm hdf-4.2.10/hdf/src/hconv.h ---- hdf-4.2.10/hdf/src/hconv.h.arm 2014-02-14 09:28:56.692514796 -0700 -+++ hdf-4.2.10/hdf/src/hconv.h 2014-02-14 09:30:03.882212944 -0700 -@@ -59,7 +59,7 @@ - /* CONSTANT DEFINITIONS */ - /*****************************************************************************/ - /* Generally Big-Endian machines */ --#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) -+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ -diff -up hdf-4.2.10/hdf/src/hdfi.h.arm hdf-4.2.10/hdf/src/hdfi.h ---- hdf-4.2.10/hdf/src/hdfi.h.arm 2014-02-14 09:28:56.685514824 -0700 -+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-14 09:28:56.693514792 -0700 -@@ -78,6 +78,7 @@ - #define DFMT_LINUXPPC 0x1111 - #define DFMT_LINUXSPARC 0x1111 - #define DFMT_LINUX390 0x1111 -+#define DFMT_LINUXARM 0x4441 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1187,6 +1188,57 @@ typedef int hdf_pint_t; - - #endif /* Linux s390/s390x */ - -+/* Linux ARM */ -+#if defined __arm__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXARM -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef long int int32; -+typedef unsigned long int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /* Linux ARM */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - diff --git a/hdf-build.patch b/hdf-build.patch index 099dd83..79d9940 100644 --- a/hdf-build.patch +++ b/hdf-build.patch @@ -1,6 +1,6 @@ -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 +diff -up hdf-4.2.16-2/java/examples/Makefile.am.build hdf-4.2.16-2/java/examples/Makefile.am +--- hdf-4.2.16-2/java/examples/Makefile.am.build 2024-01-30 16:47:54.995965404 -0700 ++++ hdf-4.2.16-2/java/examples/Makefile.am 2024-01-30 16:49:41.485107185 -0700 @@ -12,8 +12,8 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) @@ -10,11 +10,11 @@ diff -up hdf-4.2.15/java/examples/Makefile.am.build hdf-4.2.15/java/examples/Mak +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 + CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.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 hdf-4.2.16-2/java/src/jni/Makefile.am.build hdf-4.2.16-2/java/src/jni/Makefile.am +--- hdf-4.2.16-2/java/src/jni/Makefile.am.build 2023-03-02 12:23:25.000000000 -0700 ++++ hdf-4.2.16-2/java/src/jni/Makefile.am 2024-01-30 16:47:54.995965404 -0700 @@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src $(JNIFLAGS) $(XDRINC) @@ -27,9 +27,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 hdf-4.2.16-2/java/src/Makefile.am.build hdf-4.2.16-2/java/src/Makefile.am +--- hdf-4.2.16-2/java/src/Makefile.am.build 2024-01-30 16:47:54.995965404 -0700 ++++ hdf-4.2.16-2/java/src/Makefile.am 2024-01-30 16:48:41.708702534 -0700 @@ -13,8 +13,8 @@ JAVAROOT = .classes classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) @@ -40,10 +40,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 hdf-4.2.16-2/java/test/junit.sh.in.build hdf-4.2.16-2/java/test/junit.sh.in +--- hdf-4.2.16-2/java/test/junit.sh.in.build 2023-01-17 09:25:33.000000000 -0700 ++++ hdf-4.2.16-2/java/test/junit.sh.in 2024-01-30 16:47:54.995965404 -0700 @@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" BLDLIBDIR="$top_builddir/hdf4/lib" BLDDIR="." @@ -53,15 +53,15 @@ diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in TESTJARFILE=jar@PACKAGE_TARNAME@test.jar 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 hdf-4.2.16-2/java/test/Makefile.am.build hdf-4.2.16-2/java/test/Makefile.am +--- hdf-4.2.16-2/java/test/Makefile.am.build 2024-01-30 16:47:54.996965415 -0700 ++++ hdf-4.2.16-2/java/test/Makefile.am 2024-01-30 16:49:10.596467674 -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 diff --git a/hdf-ppc.patch b/hdf-ppc.patch deleted file mode 100644 index 039f876..0000000 --- a/hdf-ppc.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.ppc 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:04:01.529561298 -0600 -@@ -75,6 +75,7 @@ - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 -+#define DFMT_LINUXPPC 0x1111 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1017,6 +1018,57 @@ typedef long hdf_pint_t; - - #endif /*Linux 64 */ - -+/* Linux PPC */ -+#if defined __powerpc__ && !defined __powerpc64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXPPC -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /*Linux PPC */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - -diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.15/mfhdf/fortran/jackets.c.in ---- hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:06:39.500403641 -0600 -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes diff --git a/hdf-s390.patch b/hdf-s390.patch deleted file mode 100644 index ea21e03..0000000 --- a/hdf-s390.patch +++ /dev/null @@ -1,317 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hdfi.h.s390 hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.s390 2020-04-30 21:07:16.946922845 -0600 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:07:16.950922901 -0600 -@@ -77,6 +77,7 @@ - #define DFMT_POWERPC64 0x1111 - #define DFMT_LINUXPPC 0x1111 - #define DFMT_LINUXSPARC 0x1111 -+#define DFMT_LINUX390 0x1111 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1130,6 +1131,66 @@ typedef int hdf_pint_t; - - #endif /* Linux Sparc32/64 */ - -+/* Linux s390/s390x */ -+#if defined __s390__ || defined __s390x__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUX390 -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+#ifdef __s390x__ /* 64-bit environment */ -+typedef int int32; -+typedef unsigned int uint32; -+#else /* 32-bit environment */ -+typedef long int int32; -+typedef unsigned long int uint32; -+#endif -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+#ifdef __s390x__ /* 64-bit environment */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#else /* 32-bit environment */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#endif -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /* Linux s390/s390x */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - -diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.15/mfhdf/fortran/jackets.c.in ---- hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 2020-04-30 21:07:16.942922790 -0600 -+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:10:30.030640644 -0600 -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -up hdf-4.2.15/mfhdf/libsrc/array.c.s390 hdf-4.2.15/mfhdf/libsrc/array.c -diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.s390 hdf-4.2.15/mfhdf/libsrc/cdf.c -diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in ---- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 2020-04-30 21:07:16.957922998 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:15:23.731467288 -0600 -@@ -293,7 +293,7 @@ typedef double ncdouble; - /* - * Variables/attributes of type NC_LONG should use the C type 'nclong' - */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - /* - * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. - * http://www.unix.org/version2/whatsnew/lp64_wp.html -diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.s390 hdf-4.2.15/mfhdf/libsrc/putget.c ---- hdf-4.2.15/mfhdf/libsrc/putget.c.s390 2020-04-30 21:07:16.959923025 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:12:13.612268179 -0600 -@@ -665,7 +665,7 @@ Void *values ; - case NC_SHORT : - return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; - case NC_LONG : --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - return( xdr_int(xdrs, (nclong *)values) ) ; - #else - return( xdr_long(xdrs, (nclong *)values) ) ; -diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.15/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:14:47.574557550 -0600 -@@ -262,7 +262,7 @@ int nbytes; - - static bool_t xdrposix_getlong(); - static bool_t xdrposix_putlong(); --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -276,7 +276,7 @@ static long * xdrposix_inline(); - #if (defined __sun && defined _LP64) - static rpc_inline_t * xdrposix_inline(); - #else --#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ -+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ - static int32_t * xdrposix_inline(); - #else - static netlong * xdrposix_inline(); -@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = { - xdrposix_getpos, /* get offset in the stream */ - xdrposix_setpos, /* set offset in the stream */ - xdrposix_inline, /* prime stream for inline macros */ --#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ -+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - xdrposix_destroy, /* destroy stream */ --#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ - NULL, /* no xdr_control function defined */ - #endif - /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ -@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp) - long *lp; - { - unsigned char *up = (unsigned char *)lp ; --#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) - *lp = 0 ; - up += (sizeof(long) - 4) ; - #endif -@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp) - netlong mycopy = htonl(*lp); - up = (unsigned char *)&mycopy; - #endif --#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) - up += (sizeof(long) - 4) ; - #endif - -@@ -560,7 +560,7 @@ static long * - #if (defined __sun && defined _LP64) - static rpc_inline_t * - #else --#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ -+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ - static int32_t * - #else - static netlong * -@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len) - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - - static bool_t - xdrposix_getint(xdrs, lp) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.15/mfhdf/ncgen/ncgen.l ---- hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 2020-04-30 21:07:16.961923053 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:08:10.175628593 -0600 -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c ---- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 2020-04-30 21:07:16.963923081 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:08:53.818030313 -0600 -@@ -991,7 +991,7 @@ YY_RULE_SETUP - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/hdf-type.patch b/hdf-type.patch new file mode 100644 index 0000000..123356c --- /dev/null +++ b/hdf-type.patch @@ -0,0 +1,12 @@ +diff -up hdf-4.2.16-2/mfhdf/libsrc/putget.c.type hdf-4.2.16-2/mfhdf/libsrc/putget.c +--- hdf-4.2.16-2/mfhdf/libsrc/putget.c.type 2023-02-06 07:13:34.000000000 -0700 ++++ hdf-4.2.16-2/mfhdf/libsrc/putget.c 2024-02-05 17:50:09.981633746 -0700 +@@ -593,7 +593,7 @@ xdr_NCv1data(XDR *xdrs, u_long where, nc + #ifdef H4_HAVE_LP64 + return (xdr_int(xdrs, (nclong *)values)); + #else +- return (xdr_long(xdrs, (nclong *)values)); ++ return (xdr_long(xdrs, (long *)values)); + #endif + case NC_FLOAT: + return (xdr_float(xdrs, (float *)values)); diff --git a/hdf.spec b/hdf.spec index 81adb6f..fec8205 100644 --- a/hdf.spec +++ b/hdf.spec @@ -6,27 +6,19 @@ %endif Name: hdf -Version: 4.2.15 -Release: 16%{?dist} +Version: 4.2.16.2 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ -Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2 +Source0: https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF4/HDF4.2.16-2/src/hdf-4.2.16-2.tar.bz2 Source1: h4comp -Patch0: hdf-4.2.5-maxavailfiles.patch -Patch1: hdf-ppc.patch -Patch2: hdf-4.2.4-sparc.patch -Patch3: hdf-s390.patch -Patch4: hdf-arm.patch +# Fix type - https://github.com/HDFGroup/hdf4/pull/496 +Patch1: hdf-type.patch # Support DESTDIR in install-examples Patch5: hdf-destdir.patch # Install examples into the right location Patch6: hdf-examplesdir.patch -# Add AArch64 definitions -Patch8: hdf-aarch64.patch -# ppc64le support -# https://bugzilla.redhat.com/show_bug.cgi?id=1134385 -Patch9: hdf-ppc64le.patch # Fix java build Patch11: hdf-build.patch @@ -98,18 +90,12 @@ HDF4 java library %prep -%setup -q +%setup -q -n hdf-4.2.16-2 -#patch0 -p1 -b .maxavailfiles -%patch1 -p1 -b .ppc -%patch2 -p1 -b .sparc -%patch3 -p1 -b .s390 -%patch4 -p1 -b .arm -%patch5 -p1 -b .destdir -%patch6 -p1 -b .examplesdir -%patch8 -p1 -b .aarch64 -%patch9 -p1 -b .ppc64le -%patch11 -p1 -b .build +%patch -P 1 -p1 -b .type +%patch -P 5 -p1 -b .destdir +%patch -P 6 -p1 -b .examplesdir +%patch -P 11 -p1 -b .build %if %{with java} # Replace jars with system versions @@ -126,22 +112,22 @@ ln -s $(build-classpath junit) java/lib/junit.jar junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt %endif -ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-1.7.25.jar -ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-1.7.25.jar -ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-1.7.25.jar +ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-1.7.33.jar +ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-1.7.33.jar +ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-1.7.33.jar %endif find . -type f -name "*.h" -exec chmod 0644 '{}' \; find . -type f -name "*.c" -exec chmod 0644 '{}' \; # restore include file timestamps modified by patching -touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h +#touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h %build # This should be removed once rebased to an upstream version with # C99 compatibility fixes (bug 2167466). -%global build_type_safety_c 0 +#global build_type_safety_c 0 # For destdir/examplesdir patches autoreconf -vif @@ -190,7 +176,7 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 %make_install -C build-shared chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || : -install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/ +#install -pm 644 README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/ rm -f %{buildroot}%{_libdir}/%{name}/*.la rm -f %{buildroot}%{_libdir}/*.la @@ -202,22 +188,8 @@ for file in ncdump ncgen; do rm %{buildroot}%{_mandir}/man1/${file}.1 done -# this is done to have the same timestamp on multiarch setups -touch -c -r README.txt %{buildroot}%{_includedir}/hdf/h4config.h - -# Remove an autoconf conditional from the API that is unused and cause -# the API to be different on x86 and x86_64 -pushd %{buildroot}%{_includedir}/hdf -grep -v 'H4_SIZEOF_INTP' h4config.h > h4config.h.tmp -touch -c -r h4config.h h4config.h.tmp -mv h4config.h.tmp h4config.h -popd - #Fixup headers and scripts for multiarch %if "%{_lib}" == "lib64" -#sed -i -e s/H5pubconf.h/H5pubconf-64.h/ %{buildroot}%{_includedir}/H5public.h -#mv %{buildroot}%{_includedir}/H5pubconf.h \ - #%{buildroot}%{_includedir}/H5pubconf-64.h for x in h4cc h4fc do mv %{buildroot}%{_bindir}/${x} \ @@ -225,9 +197,6 @@ do install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x} done %else -#sed -i -e s/H5pubconf.h/H5pubconf-32.h/ %{buildroot}%{_includedir}/H5public.h -#mv %{buildroot}%{_includedir}/H5pubconf.h \ - #%{buildroot}%{_includedir}/H5pubconf-32.h for x in h4cc h4fc do mv %{buildroot}%{_bindir}/${x} \ @@ -238,13 +207,19 @@ done %check +# https://github.com/HDFGroup/hdf4/issues/473 +%ifarch ppc64le s390x +make -j1 -C build-shared check || : +make -j1 -C build-static check || : +%else make -j1 -C build-shared check make -j1 -C build-static check +%endif %files %license COPYING -%{_pkgdocdir}/ +%doc README.md release_notes/*.txt %exclude %{_pkgdocdir}/examples %{_bindir}/* %exclude %{_bindir}/h4?c* @@ -272,6 +247,9 @@ make -j1 -C build-static check %changelog +* Tue Jan 30 2024 Orion Poplawski - 4.2.16.2-1 +- Update to 4.2.16-2 + * Wed Jan 24 2024 Fedora Release Engineering - 4.2.15-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 83abd7c..d380cc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hdf-4.2.15.tar.bz2) = 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9 +SHA512 (hdf-4.2.16-2.tar.bz2) = bf7f2597c33e323ae416825abab9a174f183d37ac9b320b93d5924536b64d461bb43b91f0ff385acdd1200010f91d64ad234a296c4d0e471cadfc18764c66952 From 5104f9c534e1518843b81aa892a7967fab09188e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:08:56 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index fec8205..5ba307e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -247,6 +247,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4.2.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 30 2024 Orion Poplawski - 4.2.16.2-1 - Update to 4.2.16-2 From 0acf39f8dc75e4eb9af3a007b388cf19fd9d1841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 08:42:36 +0200 Subject: [PATCH 36/40] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- hdf.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hdf.spec b/hdf.spec index 5ba307e..b50353f 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,9 +7,10 @@ Name: hdf Version: 4.2.16.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://portal.hdfgroup.org/ Source0: https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF4/HDF4.2.16-2/src/hdf-4.2.16-2.tar.bz2 Source1: h4comp @@ -247,6 +248,9 @@ make -j1 -C build-static check %changelog +* Mon Sep 02 2024 Miroslav Suchý - 4.2.16.2-3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 4.2.16.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From aa2f244f8831becf6b87942c37ebb094d1b12dd8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 Feb 2024 08:07:37 -0700 Subject: [PATCH 37/40] Update to 4.3.0 --- .gitignore | 1 + hdf-build.patch | 40 ++++++++----------------- hdf-destdir.patch | 70 ------------------------------------------- hdf-examplesdir.patch | 50 ------------------------------- hdf.spec | 39 ++++++++++++------------ sources | 2 +- 6 files changed, 35 insertions(+), 167 deletions(-) delete mode 100644 hdf-destdir.patch delete mode 100644 hdf-examplesdir.patch diff --git a/.gitignore b/.gitignore index f989858..57826f0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ hdf-4.2.5.tar.bz2 /hdf-4.2.14.tar.bz2 /hdf-4.2.15.tar.bz2 /hdf-4.2.16-2.tar.bz2 +/hdf4.3.0.tar.gz diff --git a/hdf-build.patch b/hdf-build.patch index 79d9940..6531214 100644 --- a/hdf-build.patch +++ b/hdf-build.patch @@ -1,22 +1,8 @@ -diff -up hdf-4.2.16-2/java/examples/Makefile.am.build hdf-4.2.16-2/java/examples/Makefile.am ---- hdf-4.2.16-2/java/examples/Makefile.am.build 2024-01-30 16:47:54.995965404 -0700 -+++ hdf-4.2.16-2/java/examples/Makefile.am 2024-01-30 16:49:41.485107185 -0700 -@@ -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.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH - AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation -diff -up hdf-4.2.16-2/java/src/jni/Makefile.am.build hdf-4.2.16-2/java/src/jni/Makefile.am ---- hdf-4.2.16-2/java/src/jni/Makefile.am.build 2023-03-02 12:23:25.000000000 -0700 -+++ hdf-4.2.16-2/java/src/jni/Makefile.am 2024-01-30 16:47:54.995965404 -0700 +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 @@ -27,9 +13,9 @@ diff -up hdf-4.2.16-2/java/src/jni/Makefile.am.build hdf-4.2.16-2/java/src/jni/M # Source files for the library libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \ -diff -up hdf-4.2.16-2/java/src/Makefile.am.build hdf-4.2.16-2/java/src/Makefile.am ---- hdf-4.2.16-2/java/src/Makefile.am.build 2024-01-30 16:47:54.995965404 -0700 -+++ hdf-4.2.16-2/java/src/Makefile.am 2024-01-30 16:48:41.708702534 -0700 +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) @@ -41,9 +27,9 @@ diff -up hdf-4.2.16-2/java/src/Makefile.am.build hdf-4.2.16-2/java/src/Makefile. pkgpath = hdf/hdflib CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH -diff -up hdf-4.2.16-2/java/test/junit.sh.in.build hdf-4.2.16-2/java/test/junit.sh.in ---- hdf-4.2.16-2/java/test/junit.sh.in.build 2023-01-17 09:25:33.000000000 -0700 -+++ hdf-4.2.16-2/java/test/junit.sh.in 2024-01-30 16:47:54.995965404 -0700 +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="." @@ -53,9 +39,9 @@ diff -up hdf-4.2.16-2/java/test/junit.sh.in.build hdf-4.2.16-2/java/test/junit.s TESTJARFILE=jar@PACKAGE_TARNAME@test.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -diff -up hdf-4.2.16-2/java/test/Makefile.am.build hdf-4.2.16-2/java/test/Makefile.am ---- hdf-4.2.16-2/java/test/Makefile.am.build 2024-01-30 16:47:54.996965415 -0700 -+++ hdf-4.2.16-2/java/test/Makefile.am 2024-01-30 16:49:10.596467674 -0700 +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) diff --git a/hdf-destdir.patch b/hdf-destdir.patch deleted file mode 100644 index 57793f3..0000000 --- a/hdf-destdir.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am ---- hdf-4.2.11/config/examples.am.destdir 2015-02-09 09:43:05.000000000 -0700 -+++ hdf-4.2.11/config/examples.am 2015-02-13 13:24:09.008230956 -0700 -@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf - CLEANFILES=$(EXAMPLE_PROG) - - # How to create EXAMPLEDIR if it doesn't already exist --$(EXAMPLEDIR): -+$(DESTDIR)$(EXAMPLEDIR): - mkdir -p $@ - - # Install and uninstall rules. We install the source files, not the -@@ -54,42 +54,42 @@ install-data-local: - uninstall-local: - @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples - --install-examples: $(EXAMPLEDIR) -+install-examples: $(DESTDIR)$(EXAMPLEDIR) - @for f in X $(INSTALL_FILES); do \ - if test $$f != X; then \ -- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \ -- chmod a-x $(EXAMPLEDIR)/$$f; \ -+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \ -+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \ - fi; \ - done - @for f in X $(INSTALL_SCRIPT_FILES); do \ - if test $$f != X; then \ -- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \ -+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \ - fi; \ - done - @for f in X $(INSTALL_TOP_FILES); do \ - if test $$f != X; then \ -- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \ -- chmod a-x $(EXAMPLETOPDIR)/$$f; \ -+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \ -+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \ - fi; \ - done - @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \ - if test $$f != X; then \ -- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \ -+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \ - fi; \ - done - - uninstall-examples: -- @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ -- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ -+ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \ -+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ - fi -- @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then \ -- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \ -+ @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \ -+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \ - fi -- @if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then \ -- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \ -+ @if test -n "$(INSTALL_TOP_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \ -+ set -x; cd $$(DESTDIR)(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \ - fi -- @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \ -- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \ -+ @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \ -+ set -x; cd $(DESTDIR)$(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \ - fi - - installcheck-local: diff --git a/hdf-examplesdir.patch b/hdf-examplesdir.patch deleted file mode 100644 index 3bb66ab..0000000 --- a/hdf-examplesdir.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up a/hdf/examples/Makefile.am b/hdf/examples/Makefile.am ---- a/hdf/examples/Makefile.am 2017-01-31 14:41:51.947802481 -0700 -+++ b/hdf/examples/Makefile.am 2017-01-31 14:42:34.883572782 -0700 -@@ -46,8 +46,8 @@ - INSTALL_TOP_FILES = README - - # Where to install example files --EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c --EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples -+EXAMPLEDIR=$(docdir)/examples/c -+EXAMPLETOPDIR=$(docdir)/examples - - # How to build C programs using h4cc - $(EXTRA_PROG): $(H4CC) -diff -up a/hdf/fortran/examples/Makefile.am b/hdf/fortran/examples/Makefile.am ---- a/hdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.949802471 -0700 -+++ b/hdf/fortran/examples/Makefile.am 2017-01-31 14:43:07.968395906 -0700 -@@ -41,7 +41,7 @@ - INSTALL_SCRIPT_FILES = run-fortran-ex.sh - - # Where to install Fortran example files --EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran -+EXAMPLEDIR=$(docdir)/examples/fortran - - # How to build Fortran programs using h4fc - $(EXTRA_PROG): $(H4FC) -diff -up a/mfhdf/examples/Makefile.am b/mfhdf/examples/Makefile.am ---- a/mfhdf/examples/Makefile.am 2017-01-31 14:41:51.950802465 -0700 -+++ b/mfhdf/examples/Makefile.am 2017-01-31 14:43:23.376314066 -0700 -@@ -23,7 +23,7 @@ - SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \ - SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c - --EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c -+EXAMPLEDIR=$(docdir)/examples/c - - # How to build programs using h4cc - $(EXTRA_PROG): $(H4CC) -diff -up a/mfhdf/fortran/examples/Makefile.am b/mfhdf/fortran/examples/Makefile.am ---- a/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.952802455 -0700 -+++ b/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:43:40.206224672 -0700 -@@ -24,7 +24,7 @@ - SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f - - # Where to install example files --EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran -+EXAMPLEDIR=$(docdir)/examples/fortran - - # How to build Fortran programs using h4fc - $(EXTRA_PROG): $(H4FC) diff --git a/hdf.spec b/hdf.spec index b50353f..f430ff2 100644 --- a/hdf.spec +++ b/hdf.spec @@ -6,22 +6,16 @@ %endif Name: hdf -Version: 4.2.16.2 -Release: 3%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: https://portal.hdfgroup.org/ -Source0: https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF4/HDF4.2.16-2/src/hdf-4.2.16-2.tar.bz2 +Source0: https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf%{version}.tar.gz Source1: h4comp -# Fix type - https://github.com/HDFGroup/hdf4/pull/496 -Patch1: hdf-type.patch -# Support DESTDIR in install-examples -Patch5: hdf-destdir.patch -# Install examples into the right location -Patch6: hdf-examplesdir.patch # Fix java build -Patch11: hdf-build.patch +Patch1: hdf-build.patch # For destdir/examplesdir patches BuildRequires: automake, libtool, gcc, gcc-c++ @@ -64,6 +58,14 @@ Requires: zlib-devel%{?_isa} HDF4 development headers and libraries. +%package examples +Summary: HDF4 example source files +BuildArch: noarch + +%description examples +HDF4 example source files. + + %package libs Summary: HDF4 shared libraries @@ -91,12 +93,8 @@ HDF4 java library %prep -%setup -q -n hdf-4.2.16-2 - -%patch -P 1 -p1 -b .type -%patch -P 5 -p1 -b .destdir -%patch -P 6 -p1 -b .examplesdir -%patch -P 11 -p1 -b .build +%setup -q -n hdf4-hdf%{version} +%patch -P 1 -p1 -b .build %if %{with java} # Replace jars with system versions @@ -221,18 +219,18 @@ make -j1 -C build-static check %files %license COPYING %doc README.md release_notes/*.txt -%exclude %{_pkgdocdir}/examples %{_bindir}/* %exclude %{_bindir}/h4?c* %{_libdir}/*.so.0* -%{_mandir}/man1/*.gz %files devel %{_bindir}/h4?c* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/*.settings -%{_pkgdocdir}/examples/ + +%files examples +%doc HDF4Examples %files libs %{_libdir}/*.so.0* @@ -248,6 +246,9 @@ make -j1 -C build-static check %changelog +* Mon Sep 30 2024 Orion Poplawski - 4.3.0-1 +- Update to 4.3.0 + * Mon Sep 02 2024 Miroslav Suchý - 4.2.16.2-3 - convert license to SPDX diff --git a/sources b/sources index d380cc3..779b64a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hdf-4.2.16-2.tar.bz2) = bf7f2597c33e323ae416825abab9a174f183d37ac9b320b93d5924536b64d461bb43b91f0ff385acdd1200010f91d64ad234a296c4d0e471cadfc18764c66952 +SHA512 (hdf4.3.0.tar.gz) = dd1c433a393d893744c29479c756331e677d4201bb0e89f64b846d6c5d9a4fcee64e99b4ed46a97741b55cf0917002f00d8fa2582db5570aa0d6eb202242a558 From de8fc8291f6832f1c11e4271e640f389c28be00b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:49:12 +0000 Subject: [PATCH 38/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index f430ff2..1c5a403 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -246,6 +246,9 @@ make -j1 -C build-static check %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 4.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 30 2024 Orion Poplawski - 4.3.0-1 - Update to 4.3.0 From 7df79300fefcb6afab620439e5218c407099b992 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 19 Jan 2025 12:25:05 +0100 Subject: [PATCH 39/40] Fix GCC15 builds --- hdf-ppc64le.patch | 83 ----------------------------------------------- hdf-type.patch | 12 ------- hdf.spec | 7 ++-- 3 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 hdf-ppc64le.patch delete mode 100644 hdf-type.patch diff --git a/hdf-ppc64le.patch b/hdf-ppc64le.patch deleted file mode 100644 index e199a55..0000000 --- a/hdf-ppc64le.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hconv.h.ppc64le hdf-4.2.15/hdf/src/hconv.h ---- hdf-4.2.15/hdf/src/hconv.h.ppc64le 2020-04-30 21:25:25.183973672 -0600 -+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:25:25.191973677 -0600 -@@ -59,7 +59,7 @@ - /* CONSTANT DEFINITIONS */ - /*****************************************************************************/ - /* Generally Big-Endian machines */ --#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) -+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) && !defined(__LITTLE_ENDIAN__) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ -diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc64le hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.ppc64le 2020-04-30 21:25:25.183973672 -0600 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:25:25.192973677 -0600 -@@ -75,6 +75,7 @@ - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 -+#define DFMT_POWERPC64LE 0x4441 - #define DFMT_LINUXPPC 0x1111 - #define DFMT_LINUXSPARC 0x1111 - #define DFMT_LINUX390 0x1111 -@@ -926,18 +927,24 @@ typedef int hdf_pint_t; - - - /*-----------------------------------------------------*/ --/* Power PC 5 64 */ - #if defined __powerpc64__ -- -+/* powerpc 64 bits */ - #ifdef GOT_MACHINE - If you get an error on this line more than one machine type has been defined. - Please check your Makefile. - #endif - #define GOT_MACHINE - -+#ifdef __LITTLE_ENDIAN__ -+/* Power PC 8 64 little endian */ -+#define DF_MT DFMT_POWERPC64LE -+#else -+/* Power PC 5 64 */ -+#define DF_MT DFMT_POWERPC64 -+#endif -+ - #include /* for unbuffered i/o stuff */ - #include --#define DF_MT DFMT_POWERPC64 - typedef void VOID; - typedef void *VOIDP; - typedef char *_fcd; -@@ -973,8 +980,9 @@ typedef long hdf_pint_t; - #define INCLUDES_ARE_ANSI - #endif - -+#endif /* powerpc 64 bits */ -+ - /*-----------------------------------------------------*/ --#endif /*power PC 5 64 */ - /* Linux 64 */ - #if defined(__linux__) && defined __x86_64__ && !(defined SUN) /* i.e. 64-bit Linux but not SunOS on Intel */ - -diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le hdf-4.2.15/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le 2020-04-30 21:25:25.186973674 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:26:18.190001127 -0600 -@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp) - long *lp; - { - unsigned char *up = (unsigned char *)lp ; --#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) - *lp = 0 ; - up += (sizeof(long) - 4) ; - #endif -@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp) - netlong mycopy = htonl(*lp); - up = (unsigned char *)&mycopy; - #endif --#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) - up += (sizeof(long) - 4) ; - #endif - diff --git a/hdf-type.patch b/hdf-type.patch deleted file mode 100644 index 123356c..0000000 --- a/hdf-type.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hdf-4.2.16-2/mfhdf/libsrc/putget.c.type hdf-4.2.16-2/mfhdf/libsrc/putget.c ---- hdf-4.2.16-2/mfhdf/libsrc/putget.c.type 2023-02-06 07:13:34.000000000 -0700 -+++ hdf-4.2.16-2/mfhdf/libsrc/putget.c 2024-02-05 17:50:09.981633746 -0700 -@@ -593,7 +593,7 @@ xdr_NCv1data(XDR *xdrs, u_long where, nc - #ifdef H4_HAVE_LP64 - return (xdr_int(xdrs, (nclong *)values)); - #else -- return (xdr_long(xdrs, (nclong *)values)); -+ return (xdr_long(xdrs, (long *)values)); - #endif - case NC_FLOAT: - return (xdr_float(xdrs, (float *)values)); diff --git a/hdf.spec b/hdf.spec index 1c5a403..97a2fc7 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -136,7 +136,7 @@ rm config/*linux-gnu # TODO: upstream fix # libmfhdf.so is link to libdf.so -export CFLAGS="%{optflags} -I%{_usr}/include/tirpc" +export CFLAGS="%{optflags} -std=gnu17 -I%{_usr}/include/tirpc" export LIBS="-ltirpc" %global _configure ../configure # Java test needs this but doesn't create it @@ -246,6 +246,9 @@ make -j1 -C build-static check %changelog +* Sun Jan 19 2025 Antonio Trande - 4.3.0-3 +- Fix GCC15 builds + * Fri Jan 17 2025 Fedora Release Engineering - 4.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4b5dd59b1291310b733df199b9d21253cc43ac4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:56:31 +0000 Subject: [PATCH 40/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 97a2fc7..7fa948e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -246,6 +246,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 4.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Antonio Trande - 4.3.0-3 - Fix GCC15 builds