diff --git a/0001-add-loongarch64-support-for-hdf.patch b/0001-add-loongarch64-support-for-hdf.patch deleted file mode 100644 index e2b6675e6e52c314fba7c3285e2324b56193397e..0000000000000000000000000000000000000000 --- a/0001-add-loongarch64-support-for-hdf.patch +++ /dev/null @@ -1,351 +0,0 @@ -From 095624501c5e3eca3e341719316983b4656912b4 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Thu, 8 Jun 2023 12:32:56 +0000 -Subject: [PATCH] add loongarch64 support for hdf - ---- - hdf/src/hconv.h | 2 +- - hdf/src/hdfi.h | 39 ++++++++++++++++++++++++++++++++++++++ - mfhdf/fortran/jackets.c.in | 26 ++++++++++++------------- - mfhdf/libsrc/array.c | 2 +- - mfhdf/libsrc/cdf.c | 2 +- - mfhdf/libsrc/netcdf.h.in | 2 +- - mfhdf/libsrc/putget.c | 4 ++-- - mfhdf/libsrc/xdrposix.c | 12 ++++++------ - mfhdf/ncgen/ncgen.l | 2 +- - mfhdf/ncgen/ncgenyy.c | 2 +- - 10 files changed, 66 insertions(+), 27 deletions(-) - -diff --git a/hdf/src/hconv.h b/hdf/src/hconv.h -index d6a8748..afe33c4 100644 ---- a/hdf/src/hconv.h -+++ b/hdf/src/hconv.h -@@ -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__) && !defined(__LITTLE_ENDIAN__) -+#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__) && !defined(__loongarch64) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ -diff --git a/hdf/src/hdfi.h b/hdf/src/hdfi.h -index 42673a7..c96ad76 100644 ---- a/hdf/src/hdfi.h -+++ b/hdf/src/hdfi.h -@@ -81,6 +81,7 @@ - #define DFMT_LINUX390 0x1111 - #define DFMT_LINUXARM 0x4441 - #define DFMT_LINUXAARCH64 0x4441 -+#define DFMT_LINUXLOONGARCH64 0x4441 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1384,6 +1385,44 @@ typedef long hdf_pint_t; /* an integer the same size as a pointer - #endif - #endif /* Linux AArch64 */ - -+/* Linux LoongArch64 */ -+#if defined __loongarch64 -+ -+#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 LoongArch64 */ -+ - #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 --git a/mfhdf/fortran/jackets.c.in b/mfhdf/fortran/jackets.c.in -index b2ade09..a5ba27d 100644 ---- a/mfhdf/fortran/jackets.c.in -+++ b/mfhdf/fortran/jackets.c.in -@@ -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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - int ll; - #else - long ll; -@@ -65,7 +65,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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - /* - * 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, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, stride, basis, value, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stride, basis, value, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, stride, basis, value, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stride, basis, value, rcode) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, attlen, value, rcode, attnamelen) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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, rcode, attnamelen) - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - #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/mfhdf/libsrc/array.c b/mfhdf/libsrc/array.c -index 4e97578..8a3bd18 100644 ---- a/mfhdf/libsrc/array.c -+++ b/mfhdf/libsrc/array.c -@@ -625,7 +625,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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff --git a/mfhdf/libsrc/cdf.c b/mfhdf/libsrc/cdf.c -index bf6f7b3..ae8166e 100644 ---- a/mfhdf/libsrc/cdf.c -+++ b/mfhdf/libsrc/cdf.c -@@ -3686,7 +3686,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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loontarch64 - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff --git a/mfhdf/libsrc/netcdf.h.in b/mfhdf/libsrc/netcdf.h.in -index 2e5fb48..328c7e6 100644 ---- a/mfhdf/libsrc/netcdf.h.in -+++ b/mfhdf/libsrc/netcdf.h.in -@@ -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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - /* - * 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 --git a/mfhdf/libsrc/putget.c b/mfhdf/libsrc/putget.c -index 7e24686..c75489c 100644 ---- a/mfhdf/libsrc/putget.c -+++ b/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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - 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__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff --git a/mfhdf/libsrc/xdrposix.c b/mfhdf/libsrc/xdrposix.c -index 91802c1..e2f1cd2 100644 ---- a/mfhdf/libsrc/xdrposix.c -+++ b/mfhdf/libsrc/xdrposix.c -@@ -254,7 +254,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__ || defined __aarch64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -268,7 +268,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__ || defined __aarch64__ -+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - static int32_t * xdrposix_inline(); - #else - #if (defined __alpha ) -@@ -298,9 +298,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__ || defined __aarch64__ -+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - xdrposix_destroy, /* destroy stream */ --#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 __aarch64__) && !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) || (!defined __loongarch64)/* 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. */ -@@ -556,7 +556,7 @@ static rpc_inline_t * - #if (defined __alpha) - static int* - #else --#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ -+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - static int32_t * - #else - static netlong * -@@ -584,7 +584,7 @@ int - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - - static bool_t - xdrposix_getint(xdrs, lp) -diff --git a/mfhdf/ncgen/ncgen.l b/mfhdf/ncgen/ncgen.l -index f23bdf6..ac8fe95 100644 ---- a/mfhdf/ncgen/ncgen.l -+++ b/mfhdf/ncgen/ncgen.l -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float missing values */ - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff --git a/mfhdf/ncgen/ncgenyy.c b/mfhdf/ncgen/ncgenyy.c -index 22dcf2f..4dd47b4 100644 ---- a/mfhdf/ncgen/ncgenyy.c -+++ b/mfhdf/ncgen/ncgenyy.c -@@ -989,7 +989,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__ || __aarch64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || __aarch64__ || defined __loongarch64 - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) --- -2.33.0 - diff --git a/hdf-4.2.10-aarch64.patch b/hdf-4.2.10-aarch64.patch deleted file mode 100644 index a2699c3a1cc6e5a4dae6bae85b8a176fe9f0ce40..0000000000000000000000000000000000000000 --- a/hdf-4.2.10-aarch64.patch +++ /dev/null @@ -1,330 +0,0 @@ -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 -@@ -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 */ -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 -@@ -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 -@@ -1337,6 +1338,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 -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 -@@ -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 be a comm - - 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 -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 -@@ -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 -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) ) ; - #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; - - 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 -@@ -264,7 +264,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 - #if (defined __alpha ) -@@ -294,9 +294,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 */ - NULL, /* no xdr_control function defined */ - #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* - #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 * -@@ -580,7 +580,7 @@ int - 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) -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); - } - --#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) -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 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) - #else - if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/hdf-4.2.14.tar.bz2 b/hdf-4.2.14.tar.bz2 deleted file mode 100644 index 5c8a68922f4b0f4cc05267eb5b695f46dcacd251..0000000000000000000000000000000000000000 Binary files a/hdf-4.2.14.tar.bz2 and /dev/null differ diff --git a/hdf-4.2.4-sparc.patch b/hdf-4.2.4-sparc.patch deleted file mode 100644 index 38d4fd4ee071a6f2ca20570fd826f5b836a70695..0000000000000000000000000000000000000000 --- 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 a06481dc5e55c9dfa10b1f81ddbb1700541ba9fe..0000000000000000000000000000000000000000 --- 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-arm.patch b/hdf-arm.patch deleted file mode 100644 index 2e63af1cb1b72fab782f8be0dfcdf935c856a01c..0000000000000000000000000000000000000000 --- 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-avoid_syntax_error_el6.patch b/hdf-avoid_syntax_error_el6.patch deleted file mode 100644 index 772af9c4d8c655db0db4c45e9bd19e77572b7778..0000000000000000000000000000000000000000 --- 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-build.patch b/hdf-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..6531214b74e49f205680594f1fb8087c89870172 --- /dev/null +++ b/hdf-build.patch @@ -0,0 +1,53 @@ +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) + + # This is our main target +-lib_LTLIBRARIES=libhdf_java.la ++pkglib_LTLIBRARIES=libhdf_java.la ++ ++# No soname for JNI library ++libhdf_java_la_LDFLAGS = -avoid-version + + # Source files for the library + libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \ +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) + +-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar +-hdf_javadir = $(libdir) ++jarfile = $(PACKAGE_TARNAME).jar ++hdf_javadir = $(prefix)/lib/java + + pkgpath = hdf/hdflib + CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH +diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.in +--- hdf4-master/java/test/junit.sh.in.build 2024-02-06 17:40:20.000000000 -0700 ++++ hdf4-master/java/test/junit.sh.in 2024-02-06 22:11:46.219972170 -0700 +@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" + BLDLIBDIR="$top_builddir/hdf4/lib" + BLDDIR="." + HDFTEST_HOME="$top_srcdir/java/test" +-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar ++JARFILE=@PACKAGE_TARNAME@.jar + TESTJARFILE=jar@PACKAGE_TARNAME@test.jar + test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR + +diff -up hdf4-master/java/test/Makefile.am.build hdf4-master/java/test/Makefile.am +--- hdf4-master/java/test/Makefile.am.build 2024-02-06 17:40:20.000000000 -0700 ++++ hdf4-master/java/test/Makefile.am 2024-02-06 22:11:46.219972170 -0700 +@@ -12,7 +12,7 @@ classes: + test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) + + pkgpath = test +-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar ++hdfjarfile = $(PACKAGE_TARNAME).jar + CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH + + jarfile = jar$(PACKAGE_TARNAME)test.jar diff --git a/hdf-destdir.patch b/hdf-destdir.patch deleted file mode 100644 index 57793f3267a6a86dbaba54da23eeafd78e824137..0000000000000000000000000000000000000000 --- 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 3bb66ab858ab28bdd831618bef2b2c3ec9ed93b2..0000000000000000000000000000000000000000 --- 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-ppc.patch b/hdf-ppc.patch deleted file mode 100644 index 87360fe68a5141606b7827de58c0d420afda3adb..0000000000000000000000000000000000000000 --- a/hdf-ppc.patch +++ /dev/null @@ -1,189 +0,0 @@ -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 -@@ -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 -@@ -1013,6 +1014,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.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 -@@ -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 be a comm - - 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-ppc64le.patch b/hdf-ppc64le.patch deleted file mode 100644 index bf71a8b5337f6c5b2d76880d3a83374fda033e6b..0000000000000000000000000000000000000000 --- a/hdf-ppc64le.patch +++ /dev/null @@ -1,81 +0,0 @@ -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 -@@ -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.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 -@@ -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 -@@ -922,18 +923,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; -@@ -969,8 +976,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 */ - ---- 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 - { - 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 -@@ -458,7 +458,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-riscv64.patch b/hdf-riscv64.patch deleted file mode 100644 index 401452e460284bee3e3e92f0745a52db6dabf208..0000000000000000000000000000000000000000 --- a/hdf-riscv64.patch +++ /dev/null @@ -1,333 +0,0 @@ ---- a/hdf/src/hconv.h 2023-06-14 12:18:55.811618428 +0800 -+++ b/hdf/src/hconv.h 2023-06-14 13:06:48.836772758 +0800 -@@ -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__) && !defined(__LITTLE_ENDIAN__) && !defined(__loongarch64) -+#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__) && !defined(__loongarch64) && !defined(__riscv) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ ---- a/hdf/src/hdfi.h 2023-06-14 12:18:55.811618428 +0800 -+++ b/hdf/src/hdfi.h 2023-06-14 13:08:14.042840915 +0800 -@@ -82,6 +82,7 @@ - #define DFMT_LINUXARM 0x4441 - #define DFMT_LINUXAARCH64 0x4441 - #define DFMT_LINUXLOONGARCH64 0x4441 -+#define DFMT_RISCV64 0x4441 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1483,6 +1484,58 @@ - #endif - #endif /* Linux LoongArch64 */ - -+#if defined (__linux__) && defined (__riscv) && (__riscv_xlen == 64) -+ -+#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 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_RISCV64 -+ -+typedef void VOID; -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed 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 float float32; -+typedef double float64; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#define FILELIB UNIXBUFIO -+ -+#ifndef BIG_LONGS -+#define BIG_LONGS -+#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 -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/riscv64 */ -+ - #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 --text --unified a/mfhdf/ncgen/ncgen.l b/mfhdf/ncgen/ncgen.l ---- a/mfhdf/ncgen/ncgen.l 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/ncgen/ncgen.l 2023-06-14 13:09:07.439129345 +0800 -@@ -113,7 +113,7 @@ - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff --text --unified a/mfhdf/ncgen/ncgenyy.c b/mfhdf/ncgen/ncgenyy.c ---- a/mfhdf/ncgen/ncgenyy.c 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/ncgen/ncgenyy.c 2023-06-14 13:10:07.015371441 +0800 -@@ -989,7 +989,7 @@ - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -共同的子目录：a/mfhdf/fortran/examples 和 b/mfhdf/fortran/examples -diff --text --unified a/mfhdf/fortran/jackets.c.in b/mfhdf/fortran/jackets.c.in ---- a/mfhdf/fortran/jackets.c.in 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/fortran/jackets.c.in 2023-06-14 13:12:37.440955977 +0800 -@@ -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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - int ll; - #else - long ll; -@@ -65,7 +65,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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ - } - #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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - /* - * 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 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #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 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #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 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - #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 --text --unified a/mfhdf/libsrc/array.c b/mfhdf/libsrc/array.c ---- a/mfhdf/libsrc/array.c 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/libsrc/array.c 2023-06-14 13:13:05.924083029 +0800 -@@ -625,7 +625,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff --text --unified a/mfhdf/libsrc/cdf.c b/mfhdf/libsrc/cdf.c ---- a/mfhdf/libsrc/cdf.c 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/libsrc/cdf.c 2023-06-14 13:13:28.280587523 +0800 -@@ -3686,7 +3686,7 @@ - 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__ || defined __aarch64__ || defined __loontarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loontarch64 || (defined __riscv && __riscv_xlen == 64) - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff --text --unified a/mfhdf/libsrc/netcdf.h.in b/mfhdf/libsrc/netcdf.h.in ---- a/mfhdf/libsrc/netcdf.h.in 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/libsrc/netcdf.h.in 2023-06-14 13:13:43.177145992 +0800 -@@ -293,7 +293,7 @@ - /* - * 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - /* - * 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 --text --unified a/mfhdf/libsrc/putget.c b/mfhdf/libsrc/putget.c ---- a/mfhdf/libsrc/putget.c 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/libsrc/putget.c 2023-06-14 13:16:35.645886924 +0800 -@@ -664,7 +664,7 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - return( xdr_int(xdrs, (nclong *)values) ) ; - #else - return( xdr_long(xdrs, (nclong *)values) ) ; -@@ -1975,7 +1975,7 @@ - } /* 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__ || defined __aarch64__ || defined __loongarch64 -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff --text --unified a/mfhdf/libsrc/xdrposix.c b/mfhdf/libsrc/xdrposix.c ---- a/mfhdf/libsrc/xdrposix.c 2023-06-14 12:18:55.811618428 +0800 -+++ b/mfhdf/libsrc/xdrposix.c 2023-06-14 13:18:44.928270056 +0800 -@@ -254,7 +254,7 @@ - - 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__ || defined __aarch64__ || defined __loongarch64 -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -268,7 +268,7 @@ - #if (defined __sun && defined _LP64) - static rpc_inline_t * xdrposix_inline(); - #else --#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 -+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - static int32_t * xdrposix_inline(); - #else - #if (defined __alpha ) -@@ -298,9 +298,9 @@ - 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__ || defined __aarch64__ || defined __loongarch64 -+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - xdrposix_destroy, /* destroy stream */ --#if !(defined __aarch64__) && !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) || (!defined __loongarch64)/* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __aarch64__) && !(defined __riscv && __riscv_xlen == 64) && !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) || (!defined __loongarch64)/* 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. */ -@@ -556,7 +556,7 @@ - #if (defined __alpha) - static int* - #else --#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 -+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - static int32_t * - #else - static netlong * -@@ -584,7 +584,7 @@ - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || defined __loongarch64 || (defined __riscv && __riscv_xlen == 64) - - static bool_t - xdrposix_getint(xdrs, lp) diff --git a/hdf-s390.patch b/hdf-s390.patch deleted file mode 100644 index 7593dd78a01ae990c13d8b96e7eea085ce436ae3..0000000000000000000000000000000000000000 --- a/hdf-s390.patch +++ /dev/null @@ -1,348 +0,0 @@ -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 -@@ -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 -@@ -1126,6 +1127,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.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 -@@ -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 be a comm - - 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.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 -@@ -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.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) ) ; - #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; - - 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 -@@ -264,7 +264,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 - #if (defined __alpha ) -@@ -294,9 +294,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 __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (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 - { - 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 -@@ -458,7 +458,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 - -@@ -552,7 +552,7 @@ static rpc_inline_t * - #if (defined __alpha) - static int* - #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 * -@@ -580,7 +580,7 @@ int - 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.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); - } - --#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.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 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.spec b/hdf.spec index 1142078f47af0bf03fb06498420194b71e08a3e2..2ae8d0fd4fc0c14e150c1222b33ee98621bf4bbc 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,31 +1,12 @@ Name: hdf -Version: 4.2.14 -Release: 4 +Version: 4.3.0 +Release: 1 Summary: A general purpose library and file format for storing scientific data License: IJG URL: https://portal.hdfgroup.org/ -Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2 -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 -# Support DESTDIR in install-examples -Patch5: hdf-destdir.patch -# Install examples into the right location -Patch6: hdf-examplesdir.patch -# Add AArch64 definitions -Patch8: hdf-4.2.10-aarch64.patch -# ppc64le support -# https://bugzilla.redhat.com/show_bug.cgi?id=1134385 -Patch9: hdf-ppc64le.patch -Patch10: 0001-add-loongarch64-support-for-hdf.patch -## riscv64 support -Patch11: hdf-riscv64.patch - -# Fix syntax error on epel6 builds -# Use only if java is disabled -# Patch10: hdf-avoid_syntax_error_el6.patch +Source0: https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf%{version}.tar.gz + +Patch1: hdf-build.patch # For destdir/examplesdir patches BuildRequires: automake, libtool, gcc, gcc-c++ @@ -33,6 +14,13 @@ BuildRequires: flex byacc libjpeg-devel zlib-devel %{!?el6:libaec-devel} BuildRequires: libtirpc-devel BuildRequires: gcc-gfortran, gcc +BuildRequires: make +BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: javapackages-tools +BuildRequires: hamcrest +BuildRequires: junit +BuildRequires: slf4j + %description HDF is a general purpose library and file format for storing scientific data. HDF can store two primary objects: datasets and groups. A dataset is @@ -53,26 +41,32 @@ Requires: zlib-devel%{?_isa} %description devel HDF development headers and libraries. +%package -n java-hdf +Summary: HDF4 java library +Requires: slf4j +Obsoletes: jhdf < 3.3.1-2 + +%description -n java-hdf +HDF4 java library + %prep -%setup -q - -%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 -%patch10 -p1 -b .loongarch64 -%patch11 -p1 -b .riscv64 +%setup -q -n hdf4-hdf%{version} +%patch -P 1 -p1 -b .build + +find . -name "*.jar" -delete +ln -s $(build-classpath hamcrest/core) java/lib/hamcrest-core.jar +ln -s $(build-classpath junit) java/lib/junit.jar +# Fix test output +sed -i -e "s/JUnit version .*/JUnit version version (number)/" java/test/testfiles/JUnit-*.txt +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 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 @@ -83,13 +77,30 @@ rm config/*linux-gnu # TODO: upstream fix # Shared libraries disabled: libmfhdf.so is not correctly compiled # for missing link to libdf.so -export CFLAGS="%{optflags} -fPIC -I%{_includedir}/tirpc" + +export CFLAGS="%{optflags} -I%{_usr}/include/tirpc" export LIBS="-ltirpc" -export FFLAGS="%{optflags} -fPIC -ffixed-line-length-none -fallow-argument-mismatch" +%global _configure ../configure +# Java test needs this but doesn't create it +mkdir -p build-shared/java/lib +cd build-shared +# Java requires shared libraries, fortran requires static +%configure --disable-production --enable-java --disable-netcdf \ + --enable-shared=yes --enable-static=no --disable-fortran %{!?el6:--with-szlib} \ + --includedir=%{_includedir}/%{name} +%make_build +cd - + + +mkdir build-static +cd build-static +export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" +export FFLAGS="%{build_fflags} -fallow-argument-mismatch" %configure --disable-production --disable-java --disable-netcdf \ --enable-shared=no --enable-static=yes --enable-fortran %{!?el6:--with-szlib} \ - --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name} + --includedir=%{_includedir}/%{name} %make_build +cd - # correct the timestamps based on files used to generate the header files touch -c -r hdf/src/hdf.inc hdf/src/hdf.f90 @@ -98,10 +109,9 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 # netcdf fortran include need same treatement, but they are not shipped %install -%make_install - -install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/ - +%make_install -C build-static +%make_install -C build-shared +chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || rm -f %{buildroot}%{_libdir}/%{name}/*.la rm -f %{buildroot}%{_libdir}/*.la @@ -112,33 +122,44 @@ 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 +%if "%{_lib}" == "lib64" +for x in h4cc h4fc +do + mv %{buildroot}%{_bindir}/${x} \ + %{buildroot}%{_bindir}/${x}-64 +done +%else +for x in h4cc h4fc +do + mv %{buildroot}%{_bindir}/${x} \ + %{buildroot}%{_bindir}/${x}-32 +done +%endif %check -make -j1 check +make -j1 -C build-shared check +make -j1 -C build-static check %files %license COPYING -%{_pkgdocdir}/ -%exclude %{_pkgdocdir}/examples +%doc README.md release_notes/*.txt %{_bindir}/* -%{_mandir}/man1/*.gz %files devel %{_includedir}/%{name}/ -%{_libdir}/%{name}/ -%{_pkgdocdir}/examples/ +%{_libdir}/* +%exclude %{_libdir}/%{name}/libhdf_java.so + +%files -n java-hdf +%{_jnidir}/hdf.jar +%{_libdir}/%{name}/libhdf_java.so %changelog +* Tue Nov 12 2024 xu_ping <707078654@qq.com> - 4.3.0-1 +- Upgrade version to 4.3.0 +- Changed minimum CMake version to 3.18 +- Man pages were removed + * Wed Jun 14 2023 EastDong - 4.2.14-4 - Add riscv64 support diff --git a/hdf4.3.0.tar.gz b/hdf4.3.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9540646e913ad8fe82f7676f3d26b9d246365184 Binary files /dev/null and b/hdf4.3.0.tar.gz differ