From 5fcbd9030a2ebfc7bffd7c0cb7040d36bff88057 Mon Sep 17 00:00:00 2001 From: Kevin Lockwood Date: Mon, 28 Oct 2024 16:30:26 -0700 Subject: [PATCH] Upgrade hdf to 4.3.0 --- SPECS-EXTENDED/hdf/hdf-4.2.4-sparc.patch | 78 ------ SPECS-EXTENDED/hdf/hdf-aarch64.patch | 289 --------------------- SPECS-EXTENDED/hdf/hdf-arm.patch | 81 ------ SPECS-EXTENDED/hdf/hdf-build.patch | 44 ++-- SPECS-EXTENDED/hdf/hdf-destdir.patch | 70 ----- SPECS-EXTENDED/hdf/hdf-examplesdir.patch | 50 ---- SPECS-EXTENDED/hdf/hdf-ppc.patch | 189 -------------- SPECS-EXTENDED/hdf/hdf-ppc64le.patch | 83 ------ SPECS-EXTENDED/hdf/hdf-s390.patch | 317 ----------------------- SPECS-EXTENDED/hdf/hdf.signatures.json | 4 +- SPECS-EXTENDED/hdf/hdf.spec | 44 +--- cgmanifest.json | 4 +- 12 files changed, 33 insertions(+), 1220 deletions(-) delete mode 100644 SPECS-EXTENDED/hdf/hdf-4.2.4-sparc.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-aarch64.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-arm.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-destdir.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-examplesdir.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-ppc.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-ppc64le.patch delete mode 100644 SPECS-EXTENDED/hdf/hdf-s390.patch diff --git a/SPECS-EXTENDED/hdf/hdf-4.2.4-sparc.patch b/SPECS-EXTENDED/hdf/hdf-4.2.4-sparc.patch deleted file mode 100644 index 38d4fd4ee07..00000000000 --- a/SPECS-EXTENDED/hdf/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/SPECS-EXTENDED/hdf/hdf-aarch64.patch b/SPECS-EXTENDED/hdf/hdf-aarch64.patch deleted file mode 100644 index 1865e72b3a9..00000000000 --- a/SPECS-EXTENDED/hdf/hdf-aarch64.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hconv.h.aarch64 hdf-4.2.15/hdf/src/hconv.h ---- hdf-4.2.15/hdf/src/hconv.h.aarch64 2020-04-30 21:16:25.325499508 -0600 -+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:16:25.338499580 -0600 -@@ -59,7 +59,7 @@ - /* CONSTANT DEFINITIONS */ - /*****************************************************************************/ - /* Generally Big-Endian machines */ --#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) -+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ -diff -up hdf-4.2.15/hdf/src/hdfi.h.aarch64 hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.aarch64 2020-04-30 21:16:25.326499514 -0600 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:16:25.340499591 -0600 -@@ -79,6 +79,7 @@ - #define DFMT_LINUXSPARC 0x1111 - #define DFMT_LINUX390 0x1111 - #define DFMT_LINUXARM 0x4441 -+#define DFMT_LINUXAARCH64 0x4441 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1341,6 +1342,44 @@ typedef long hdf_pint_t; - - #endif /* IA64 */ - -+/* Linux AArch64 */ -+#if defined __aarch64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXAARCH64 -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+#endif /* Linux AArch64 */ -+ - #ifndef GOT_MACHINE - No machine type has been defined. Your Makefile needs to have someing like - -DSUN or -DUNICOS in order for the HDF internal structures to be defined -diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 hdf-4.2.15/mfhdf/fortran/jackets.c.in ---- hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 2020-04-30 21:16:25.318499470 -0600 -+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:20:28.346831868 -0600 -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -up hdf-4.2.15/mfhdf/libsrc/array.c.aarch64 hdf-4.2.15/mfhdf/libsrc/array.c -diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.aarch64 hdf-4.2.15/mfhdf/libsrc/cdf.c -diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in ---- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 2020-04-30 21:16:25.347499629 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:24:11.366838259 -0600 -@@ -293,7 +293,7 @@ typedef double ncdouble; - /* - * Variables/attributes of type NC_LONG should use the C type 'nclong' - */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - /* - * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. - * http://www.unix.org/version2/whatsnew/lp64_wp.html -diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 hdf-4.2.15/mfhdf/libsrc/putget.c ---- hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 2020-04-30 21:16:25.349499640 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:21:11.344052951 -0600 -@@ -665,7 +665,7 @@ Void *values ; - case NC_SHORT : - return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; - case NC_LONG : --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - return( xdr_int(xdrs, (nclong *)values) ) ; - #else - return( xdr_long(xdrs, (nclong *)values) ) ; -diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 hdf-4.2.15/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 2020-04-30 21:16:25.321499486 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:23:48.397752506 -0600 -@@ -262,7 +262,7 @@ int nbytes; - - static bool_t xdrposix_getlong(); - static bool_t xdrposix_putlong(); --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -276,7 +276,7 @@ static long * xdrposix_inline(); - #if (defined __sun && defined _LP64) - static rpc_inline_t * xdrposix_inline(); - #else --#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ -+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static int32_t * xdrposix_inline(); - #else - static netlong * xdrposix_inline(); -@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = { - xdrposix_getpos, /* get offset in the stream */ - xdrposix_setpos, /* set offset in the stream */ - xdrposix_inline, /* prime stream for inline macros */ --#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - xdrposix_destroy, /* destroy stream */ --#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) && !(defined __aarch64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ - NULL, /* no xdr_control function defined */ - #endif - /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ -@@ -560,7 +560,7 @@ static long * - #if (defined __sun && defined _LP64) - static rpc_inline_t * - #else --#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ -+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - static int32_t * - #else - static netlong * -@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len) - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ - - static bool_t - xdrposix_getint(xdrs, lp) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgen.l ---- hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 2020-04-30 21:16:25.376499789 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:17:29.876854089 -0600 -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c ---- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 2020-04-30 21:16:25.382499822 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:18:12.880090311 -0600 -@@ -991,7 +991,7 @@ YY_RULE_SETUP - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || defined __aarch64__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/SPECS-EXTENDED/hdf/hdf-arm.patch b/SPECS-EXTENDED/hdf/hdf-arm.patch deleted file mode 100644 index 2e63af1cb1b..00000000000 --- a/SPECS-EXTENDED/hdf/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/SPECS-EXTENDED/hdf/hdf-build.patch b/SPECS-EXTENDED/hdf/hdf-build.patch index 099dd83225f..6531214b74e 100644 --- a/SPECS-EXTENDED/hdf/hdf-build.patch +++ b/SPECS-EXTENDED/hdf/hdf-build.patch @@ -1,22 +1,8 @@ -diff -up hdf-4.2.15/java/examples/Makefile.am.build hdf-4.2.15/java/examples/Makefile.am ---- hdf-4.2.15/java/examples/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/java/examples/Makefile.am 2020-04-30 21:34:13.856216928 -0600 -@@ -12,8 +12,8 @@ classes: - test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) - - pkgpath = examples --hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar --jarfile = jar$(PACKAGE_TARNAME)examples.jar -+hdfjarfile = $(PACKAGE_TARNAME).jar -+jarfile = $(PACKAGE_TARNAME)examples.jar - - CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH - AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation -diff -up hdf-4.2.15/java/src/jni/Makefile.am.build hdf-4.2.15/java/src/jni/Makefile.am ---- hdf-4.2.15/java/src/jni/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/java/src/jni/Makefile.am 2020-04-30 21:34:13.857216934 -0600 +diff -up hdf4-master/java/src/jni/Makefile.am.build hdf4-master/java/src/jni/Makefile.am +--- hdf4-master/java/src/jni/Makefile.am.build 2024-02-06 22:11:46.219972170 -0700 ++++ hdf4-master/java/src/jni/Makefile.am 2024-02-06 22:12:33.262288868 -0700 @@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src - $(JNIFLAGS) $(XDRINC) + $(JNIFLAGS) # This is our main target -lib_LTLIBRARIES=libhdf_java.la @@ -27,9 +13,9 @@ diff -up hdf-4.2.15/java/src/jni/Makefile.am.build hdf-4.2.15/java/src/jni/Makef # Source files for the library libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \ -diff -up hdf-4.2.15/java/src/Makefile.am.build hdf-4.2.15/java/src/Makefile.am ---- hdf-4.2.15/java/src/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/java/src/Makefile.am 2020-04-30 21:34:13.857216934 -0600 +diff -up hdf4-master/java/src/Makefile.am.build hdf4-master/java/src/Makefile.am +--- hdf4-master/java/src/Makefile.am.build 2024-02-06 17:40:20.000000000 -0700 ++++ hdf4-master/java/src/Makefile.am 2024-02-06 22:11:46.219972170 -0700 @@ -13,8 +13,8 @@ JAVAROOT = .classes classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) @@ -40,10 +26,10 @@ diff -up hdf-4.2.15/java/src/Makefile.am.build hdf-4.2.15/java/src/Makefile.am +hdf_javadir = $(prefix)/lib/java pkgpath = hdf/hdflib - CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH -diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in ---- hdf-4.2.15/java/test/junit.sh.in.build 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/java/test/junit.sh.in 2020-04-30 21:34:13.858216939 -0600 + CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH +diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.in +--- hdf4-master/java/test/junit.sh.in.build 2024-02-06 17:40:20.000000000 -0700 ++++ hdf4-master/java/test/junit.sh.in 2024-02-06 22:11:46.219972170 -0700 @@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" BLDLIBDIR="$top_builddir/hdf4/lib" BLDDIR="." @@ -53,15 +39,15 @@ diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in TESTJARFILE=jar@PACKAGE_TARNAME@test.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -diff -up hdf-4.2.15/java/test/Makefile.am.build hdf-4.2.15/java/test/Makefile.am ---- hdf-4.2.15/java/test/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/java/test/Makefile.am 2020-04-30 21:41:47.966938811 -0600 +diff -up hdf4-master/java/test/Makefile.am.build hdf4-master/java/test/Makefile.am +--- hdf4-master/java/test/Makefile.am.build 2024-02-06 17:40:20.000000000 -0700 ++++ hdf4-master/java/test/Makefile.am 2024-02-06 22:11:46.219972170 -0700 @@ -12,7 +12,7 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = test -hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar +hdfjarfile = $(PACKAGE_TARNAME).jar - CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH + CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)test.jar diff --git a/SPECS-EXTENDED/hdf/hdf-destdir.patch b/SPECS-EXTENDED/hdf/hdf-destdir.patch deleted file mode 100644 index 57793f3267a..00000000000 --- a/SPECS-EXTENDED/hdf/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/SPECS-EXTENDED/hdf/hdf-examplesdir.patch b/SPECS-EXTENDED/hdf/hdf-examplesdir.patch deleted file mode 100644 index 3bb66ab858a..00000000000 --- a/SPECS-EXTENDED/hdf/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/SPECS-EXTENDED/hdf/hdf-ppc.patch b/SPECS-EXTENDED/hdf/hdf-ppc.patch deleted file mode 100644 index 039f876ff0a..00000000000 --- a/SPECS-EXTENDED/hdf/hdf-ppc.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.ppc 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:04:01.529561298 -0600 -@@ -75,6 +75,7 @@ - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 -+#define DFMT_LINUXPPC 0x1111 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1017,6 +1018,57 @@ typedef long hdf_pint_t; - - #endif /*Linux 64 */ - -+/* Linux PPC */ -+#if defined __powerpc__ && !defined __powerpc64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXPPC -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /*Linux PPC */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - -diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.15/mfhdf/fortran/jackets.c.in ---- hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:06:39.500403641 -0600 -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes diff --git a/SPECS-EXTENDED/hdf/hdf-ppc64le.patch b/SPECS-EXTENDED/hdf/hdf-ppc64le.patch deleted file mode 100644 index e199a55824b..00000000000 --- a/SPECS-EXTENDED/hdf/hdf-ppc64le.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hconv.h.ppc64le hdf-4.2.15/hdf/src/hconv.h ---- hdf-4.2.15/hdf/src/hconv.h.ppc64le 2020-04-30 21:25:25.183973672 -0600 -+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:25:25.191973677 -0600 -@@ -59,7 +59,7 @@ - /* CONSTANT DEFINITIONS */ - /*****************************************************************************/ - /* Generally Big-Endian machines */ --#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) -+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) && !defined(__LITTLE_ENDIAN__) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ -diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc64le hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.ppc64le 2020-04-30 21:25:25.183973672 -0600 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:25:25.192973677 -0600 -@@ -75,6 +75,7 @@ - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 -+#define DFMT_POWERPC64LE 0x4441 - #define DFMT_LINUXPPC 0x1111 - #define DFMT_LINUXSPARC 0x1111 - #define DFMT_LINUX390 0x1111 -@@ -926,18 +927,24 @@ typedef int hdf_pint_t; - - - /*-----------------------------------------------------*/ --/* Power PC 5 64 */ - #if defined __powerpc64__ -- -+/* powerpc 64 bits */ - #ifdef GOT_MACHINE - If you get an error on this line more than one machine type has been defined. - Please check your Makefile. - #endif - #define GOT_MACHINE - -+#ifdef __LITTLE_ENDIAN__ -+/* Power PC 8 64 little endian */ -+#define DF_MT DFMT_POWERPC64LE -+#else -+/* Power PC 5 64 */ -+#define DF_MT DFMT_POWERPC64 -+#endif -+ - #include /* for unbuffered i/o stuff */ - #include --#define DF_MT DFMT_POWERPC64 - typedef void VOID; - typedef void *VOIDP; - typedef char *_fcd; -@@ -973,8 +980,9 @@ typedef long hdf_pint_t; - #define INCLUDES_ARE_ANSI - #endif - -+#endif /* powerpc 64 bits */ -+ - /*-----------------------------------------------------*/ --#endif /*power PC 5 64 */ - /* Linux 64 */ - #if defined(__linux__) && defined __x86_64__ && !(defined SUN) /* i.e. 64-bit Linux but not SunOS on Intel */ - -diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le hdf-4.2.15/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le 2020-04-30 21:25:25.186973674 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:26:18.190001127 -0600 -@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp) - long *lp; - { - unsigned char *up = (unsigned char *)lp ; --#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) - *lp = 0 ; - up += (sizeof(long) - 4) ; - #endif -@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp) - netlong mycopy = htonl(*lp); - up = (unsigned char *)&mycopy; - #endif --#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__)) - up += (sizeof(long) - 4) ; - #endif - diff --git a/SPECS-EXTENDED/hdf/hdf-s390.patch b/SPECS-EXTENDED/hdf/hdf-s390.patch deleted file mode 100644 index ea21e037048..00000000000 --- a/SPECS-EXTENDED/hdf/hdf-s390.patch +++ /dev/null @@ -1,317 +0,0 @@ -diff -up hdf-4.2.15/hdf/src/hdfi.h.s390 hdf-4.2.15/hdf/src/hdfi.h ---- hdf-4.2.15/hdf/src/hdfi.h.s390 2020-04-30 21:07:16.946922845 -0600 -+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:07:16.950922901 -0600 -@@ -77,6 +77,7 @@ - #define DFMT_POWERPC64 0x1111 - #define DFMT_LINUXPPC 0x1111 - #define DFMT_LINUXSPARC 0x1111 -+#define DFMT_LINUX390 0x1111 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1130,6 +1131,66 @@ typedef int hdf_pint_t; - - #endif /* Linux Sparc32/64 */ - -+/* Linux s390/s390x */ -+#if defined __s390__ || defined __s390x__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUX390 -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+#ifdef __s390x__ /* 64-bit environment */ -+typedef int int32; -+typedef unsigned int uint32; -+#else /* 32-bit environment */ -+typedef long int int32; -+typedef unsigned long int uint32; -+#endif -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+#ifdef __s390x__ /* 64-bit environment */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#else /* 32-bit environment */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#endif -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /* Linux s390/s390x */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - -diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.15/mfhdf/fortran/jackets.c.in ---- hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 2020-04-30 21:07:16.942922790 -0600 -+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:10:30.030640644 -0600 -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - int ll; - #else - long ll; -@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -up hdf-4.2.15/mfhdf/libsrc/array.c.s390 hdf-4.2.15/mfhdf/libsrc/array.c -diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.s390 hdf-4.2.15/mfhdf/libsrc/cdf.c -diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in ---- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 2020-04-30 21:07:16.957922998 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:15:23.731467288 -0600 -@@ -293,7 +293,7 @@ typedef double ncdouble; - /* - * Variables/attributes of type NC_LONG should use the C type 'nclong' - */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - /* - * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. - * http://www.unix.org/version2/whatsnew/lp64_wp.html -diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.s390 hdf-4.2.15/mfhdf/libsrc/putget.c ---- hdf-4.2.15/mfhdf/libsrc/putget.c.s390 2020-04-30 21:07:16.959923025 -0600 -+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:12:13.612268179 -0600 -@@ -665,7 +665,7 @@ Void *values ; - case NC_SHORT : - return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; - case NC_LONG : --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - return( xdr_int(xdrs, (nclong *)values) ) ; - #else - return( xdr_long(xdrs, (nclong *)values) ) ; -diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.15/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 2020-03-03 10:40:50.000000000 -0700 -+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:14:47.574557550 -0600 -@@ -262,7 +262,7 @@ int nbytes; - - static bool_t xdrposix_getlong(); - static bool_t xdrposix_putlong(); --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -276,7 +276,7 @@ static long * xdrposix_inline(); - #if (defined __sun && defined _LP64) - static rpc_inline_t * xdrposix_inline(); - #else --#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ -+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ - static int32_t * xdrposix_inline(); - #else - static netlong * xdrposix_inline(); -@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = { - xdrposix_getpos, /* get offset in the stream */ - xdrposix_setpos, /* set offset in the stream */ - xdrposix_inline, /* prime stream for inline macros */ --#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ -+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - xdrposix_destroy, /* destroy stream */ --#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ -+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ - NULL, /* no xdr_control function defined */ - #endif - /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ -@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp) - long *lp; - { - unsigned char *up = (unsigned char *)lp ; --#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) - *lp = 0 ; - up += (sizeof(long) - 4) ; - #endif -@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp) - netlong mycopy = htonl(*lp); - up = (unsigned char *)&mycopy; - #endif --#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__)) -+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__)) - up += (sizeof(long) - 4) ; - #endif - -@@ -560,7 +560,7 @@ static long * - #if (defined __sun && defined _LP64) - static rpc_inline_t * - #else --#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ -+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ - static int32_t * - #else - static netlong * -@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len) - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ - - static bool_t - xdrposix_getint(xdrs, lp) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.15/mfhdf/ncgen/ncgen.l ---- hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 2020-04-30 21:07:16.961923053 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:08:10.175628593 -0600 -@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) -diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c ---- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 2020-04-30 21:07:16.963923081 -0600 -+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:08:53.818030313 -0600 -@@ -991,7 +991,7 @@ YY_RULE_SETUP - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ - if (dd < INT_MIN || dd > INT_MAX) - #else - if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/SPECS-EXTENDED/hdf/hdf.signatures.json b/SPECS-EXTENDED/hdf/hdf.signatures.json index d47dde71816..3327ef5501c 100644 --- a/SPECS-EXTENDED/hdf/hdf.signatures.json +++ b/SPECS-EXTENDED/hdf/hdf.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "h4comp": "30ad034adba9e72b23e70005c6311bc85c90a0e16401089785496a985f3e23e7", - "hdf-4.2.15.tar.bz2": "bde035ef5a1cd5fdbd0a7f1fa5c17e98bbd599300189ac4d234f16e9bb7bcb12" + "hdf-4.3.0.tar.gz": "a6639a556650e6ea8632a17b8188a69de844bdff54ce121a1fd5b92c8dd06cb1" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/hdf/hdf.spec b/SPECS-EXTENDED/hdf/hdf.spec index d6b74f73090..930e777606d 100644 --- a/SPECS-EXTENDED/hdf/hdf.spec +++ b/SPECS-EXTENDED/hdf/hdf.spec @@ -6,29 +6,17 @@ %endif Summary: A general purpose library and file format for storing scientific data Name: hdf -Version: 4.2.15 -Release: 13%{?dist} +Version: 4.3.0 +Release: 1%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://portal.hdfgroup.org/ -Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2 +Source0: https://github.com/HDFGroup/%{name}4/archive/refs/tags/%{name}%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: h4comp -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-aarch64.patch -# ppc64le support -# https://bugzilla.redhat.com/show_bug.cgi?id=1134385 -Patch9: hdf-ppc64le.patch # Fix java build -Patch11: hdf-build.patch +Patch1: hdf-build.patch + BuildRequires: %{!?el6:libaec-devel} # For destdir/examplesdir patches BuildRequires: automake @@ -46,13 +34,13 @@ BuildRequires: libtool BuildRequires: make BuildRequires: slf4j BuildRequires: zlib-devel -Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if %{with java} BuildRequires: java-devel BuildRequires: javapackages-tools %else Obsoletes: java-hdf < %{version}-%{release} %endif +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description HDF4 is a general purpose library and file format for storing scientific data. @@ -99,7 +87,7 @@ HDF4 java library %prep -%autosetup -p1 -S gendiff +%autosetup -p1 -S gendiff -n %{name}4-%{name}%{version} %if %{with java} # Replace jars with system versions @@ -119,10 +107,6 @@ ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.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.1 ./hdf/src/hdfi.h - - %build # For destdir/examplesdir patches @@ -170,8 +154,6 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 %make_install -C build-shared chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || : -install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/ - find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print @@ -183,7 +165,7 @@ for file in ncdump ncgen; do done # this is done to have the same timestamp on multiarch setups -touch -c -r README.txt %{buildroot}%{_includedir}/hdf/h4config.h +touch -c -r README.md %{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 @@ -224,19 +206,17 @@ make -j1 -C build-static check %files %license COPYING -%{_pkgdocdir}/ -%exclude %{_pkgdocdir}/examples +%doc README.md release_notes/*.txt %{_bindir}/* %exclude %{_bindir}/h4?c* %{_libdir}/*.so.0* -%{_mandir}/man1/*.gz %files devel %{_bindir}/h4?c* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/*.settings -%{_pkgdocdir}/examples/ +%doc HDF4Examples %files libs %{_libdir}/*.so.0* @@ -252,6 +232,10 @@ make -j1 -C build-static check %changelog +* Mon Oct 28 2024 Kevin Lockwood - 4.3.0-1 +- Upgrade to 4.3.0 +- License verified. + * Thu Aug 10 2023 Archana Choudhary - 4.2.15-13 - Initial CBL-Mariner import from Fedora 37 (license: MIT). - License verified. diff --git a/cgmanifest.json b/cgmanifest.json index 9844b8f542f..92888a483ea 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5170,8 +5170,8 @@ "type": "other", "other": { "name": "hdf", - "version": "4.2.15", - "downloadUrl": "https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2" + "version": "4.3.0", + "downloadUrl": "https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf4.3.0.tar.gz" } } },