diff --git a/.gitignore b/.gitignore index 57826f0..15d184c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,3 @@ hdf-4.2.5.tar.bz2 /hdf-4.2.8.tar.bz2 /hdf-4.2.9.tar.bz2 /hdf-4.2.10.tar.bz2 -/hdf-4.2.11.tar.bz2 -/hdf-4.2.12.tar.bz2 -/hdf-4.2.13.tar.bz2 -/hdf-4.2.14.tar.bz2 -/hdf-4.2.15.tar.bz2 -/hdf-4.2.16-2.tar.bz2 -/hdf4.3.0.tar.gz diff --git a/h4comp b/h4comp deleted file mode 100644 index aeb861b..0000000 --- a/h4comp +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -BITS=32 -[ -d /usr/lib64 ] && BITS=64 - -exec $0-${BITS} "$@" diff --git a/hdf-4.2.10-aarch64.patch b/hdf-4.2.10-aarch64.patch new file mode 100644 index 0000000..a2699c3 --- /dev/null +++ b/hdf-4.2.10-aarch64.patch @@ -0,0 +1,330 @@ +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.4-sparc.patch b/hdf-4.2.4-sparc.patch new file mode 100644 index 0000000..38d4fd4 --- /dev/null +++ b/hdf-4.2.4-sparc.patch @@ -0,0 +1,78 @@ +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 new file mode 100644 index 0000000..a06481d --- /dev/null +++ b/hdf-4.2.5-maxavailfiles.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..2e63af1 --- /dev/null +++ b/hdf-arm.patch @@ -0,0 +1,81 @@ +diff -up hdf-4.2.10/hdf/src/hconv.h.arm hdf-4.2.10/hdf/src/hconv.h +--- hdf-4.2.10/hdf/src/hconv.h.arm 2014-02-14 09:28:56.692514796 -0700 ++++ hdf-4.2.10/hdf/src/hconv.h 2014-02-14 09:30:03.882212944 -0700 +@@ -59,7 +59,7 @@ + /* CONSTANT DEFINITIONS */ + /*****************************************************************************/ + /* Generally Big-Endian machines */ +-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) ++#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) + # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ + # define UI8_OUT DFKnb1b + # define SI16_IN DFKnb2b /* S = Signed */ +diff -up hdf-4.2.10/hdf/src/hdfi.h.arm hdf-4.2.10/hdf/src/hdfi.h +--- hdf-4.2.10/hdf/src/hdfi.h.arm 2014-02-14 09:28:56.685514824 -0700 ++++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-14 09:28:56.693514792 -0700 +@@ -78,6 +78,7 @@ + #define DFMT_LINUXPPC 0x1111 + #define DFMT_LINUXSPARC 0x1111 + #define DFMT_LINUX390 0x1111 ++#define DFMT_LINUXARM 0x4441 + + /* I/O library constants */ + #define UNIXUNBUFIO 1 +@@ -1187,6 +1188,57 @@ typedef int hdf_pint_t; + + #endif /* Linux s390/s390x */ + ++/* Linux ARM */ ++#if defined __arm__ ++ ++#ifdef GOT_MACHINE ++If you get an error on this line more than one machine type has been defined. ++Please check your Makefile. ++#endif ++#define GOT_MACHINE ++ ++#include /* for unbuffered i/o stuff */ ++#include ++#define DF_MT DFMT_LINUXARM ++typedef void VOID; ++typedef void *VOIDP; ++typedef char *_fcd; ++typedef char char8; ++typedef unsigned char uchar8; ++typedef char int8; ++typedef unsigned char uint8; ++typedef short int int16; ++typedef unsigned short int uint16; ++typedef long int int32; ++typedef unsigned long int uint32; ++typedef int intn; ++typedef unsigned int uintn; ++typedef int intf; /* size of INTEGERs in Fortran compiler */ ++typedef float float32; ++typedef double float64; ++typedef int hdf_pint_t; /* an integer the same size as a pointer */ ++#define FNAME_POST_UNDERSCORE ++#define _fcdtocp(desc) (desc) ++#ifdef HAVE_FMPOOL ++#define FILELIB PAGEBUFIO /* enable page buffering */ ++#else ++#define FILELIB UNIXBUFIO ++#endif ++ ++/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ ++ ++/* Determine the memory manager we are going to use. Valid values are: */ ++/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ ++/* what each does */ ++#define JMEMSYS MEM_ANSI ++ ++#ifdef __GNUC__ ++#define HAVE_STDC ++#define INCLUDES_ARE_ANSI ++#endif ++ ++#endif /* Linux ARM */ ++ + /*-----------------------------------------------------*/ + /* 64-bit Free BSD */ + diff --git a/hdf-build.patch b/hdf-build.patch deleted file mode 100644 index 6531214..0000000 --- a/hdf-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 new file mode 100644 index 0000000..65231dc --- /dev/null +++ b/hdf-destdir.patch @@ -0,0 +1,66 @@ +diff -up hdf-4.2.10/config/examples.am.destdir hdf-4.2.10/config/examples.am +--- hdf-4.2.10/config/examples.am.destdir 2014-02-09 19:28:50.000000000 -0700 ++++ hdf-4.2.10/config/examples.am 2014-02-14 10:02:35.039386643 -0700 +@@ -45,7 +45,7 @@ CLEANFILES=$(EXAMPLE_PROG) + + # How to create EXAMPLEDIR if it doesn't already exist + $(EXAMPLEDIR): +- mkdir -p $@ ++ mkdir -p $(DESTDIR)$@ + + # Install and uninstall rules. We install the source files, not the + # example programs themselves. +@@ -57,39 +57,39 @@ uninstall-local: + install-examples: $(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 new file mode 100644 index 0000000..6dddcc9 --- /dev/null +++ b/hdf-examplesdir.patch @@ -0,0 +1,50 @@ +diff -up hdf-4.2.10/hdf/examples/Makefile.am.examplesdir hdf-4.2.10/hdf/examples/Makefile.am +--- hdf-4.2.10/hdf/examples/Makefile.am.examplesdir 2014-02-09 19:28:50.000000000 -0700 ++++ hdf-4.2.10/hdf/examples/Makefile.am 2014-02-14 10:10:17.854023687 -0700 +@@ -46,8 +46,8 @@ INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh + INSTALL_TOP_FILES = README + + # Where to install example files +-EXAMPLEDIR=$(prefix)/examples/c +-EXAMPLETOPDIR=$(prefix)/examples ++EXAMPLEDIR=$(docdir)/examples/c ++EXAMPLETOPDIR=$(docdir)/examples + + # How to build C programs using h4cc + $(EXTRA_PROG): $(H4CC) +diff -up hdf-4.2.10/hdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.10/hdf/fortran/examples/Makefile.am +--- hdf-4.2.10/hdf/fortran/examples/Makefile.am.examplesdir 2014-02-09 19:28:49.000000000 -0700 ++++ hdf-4.2.10/hdf/fortran/examples/Makefile.am 2014-02-14 10:10:30.082961395 -0700 +@@ -41,7 +41,7 @@ INSTALL_FILES= VD_read_from_vdata.f VD_r + INSTALL_SCRIPT_FILES = run-fortran-ex.sh + + # Where to install Fortran example files +-EXAMPLEDIR=$(prefix)/examples/fortran ++EXAMPLEDIR=$(docdir)/examples/fortran + + # How to build Fortran programs using h4fc + $(EXTRA_PROG): $(H4FC) +diff -up hdf-4.2.10/mfhdf/examples/Makefile.am.examplesdir hdf-4.2.10/mfhdf/examples/Makefile.am +--- hdf-4.2.10/mfhdf/examples/Makefile.am.examplesdir 2014-02-09 19:28:45.000000000 -0700 ++++ hdf-4.2.10/mfhdf/examples/Makefile.am 2014-02-14 10:09:41.465209051 -0700 +@@ -23,7 +23,7 @@ INSTALL_FILES = SD_create_sds.c SD_write + 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=$(prefix)/examples/c ++EXAMPLEDIR=$(docdir)/examples/c + + # How to build programs using h4cc + $(EXTRA_PROG): $(H4CC) +diff -up hdf-4.2.10/mfhdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.10/mfhdf/fortran/examples/Makefile.am +--- hdf-4.2.10/mfhdf/fortran/examples/Makefile.am.examplesdir 2014-02-09 19:28:44.000000000 -0700 ++++ hdf-4.2.10/mfhdf/fortran/examples/Makefile.am 2014-02-14 10:09:52.818151212 -0700 +@@ -24,7 +24,7 @@ INSTALL_FILES=SD_create_sds.f SD_write_t + SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f + + # Where to install example files +-EXAMPLEDIR=$(prefix)/examples/fortran ++EXAMPLEDIR=$(docdir)/examples/fortran + + # How to build Fortran programs using h4fc + $(EXTRA_PROG): $(H4FC) diff --git a/hdf-format.patch b/hdf-format.patch new file mode 100644 index 0000000..8c10f76 --- /dev/null +++ b/hdf-format.patch @@ -0,0 +1,561 @@ +diff -up hdf-4.2.9/hdf/util/hdf2gif.c.format hdf-4.2.9/hdf/util/hdf2gif.c +--- hdf-4.2.9/hdf/util/hdf2gif.c.format 2013-02-07 21:44:54.000000000 -0700 ++++ hdf-4.2.9/hdf/util/hdf2gif.c 2014-01-31 22:49:26.533838223 -0700 +@@ -143,7 +143,7 @@ int main(int argc , char **argv) { + if(file_id == -1) { + printf("Unable to open HDF file"); + status = HEvalue(1); +- printf(HEstring(status)); ++ printf("%s",HEstring(status)); + exit(0); + } + +@@ -162,7 +162,7 @@ int main(int argc , char **argv) { + + if ((status = GRfileinfo(gr_id , &n_images , &n_fileattributes)) == -1) { + status = HEvalue(1); +- printf(HEstring(status)); ++ printf("%s",HEstring(status)); + exit(0); + } + +diff -up hdf-4.2.9/hdf/util/writehdf.c.format hdf-4.2.9/hdf/util/writehdf.c +--- hdf-4.2.9/hdf/util/writehdf.c.format 2013-02-07 21:44:54.000000000 -0700 ++++ hdf-4.2.9/hdf/util/writehdf.c 2014-01-31 22:38:49.331653168 -0700 +@@ -77,13 +77,13 @@ char *GIFFileName; + if(file_id == -1) { + printf("Unable to create HDF file"); + status = HEvalue(1); +- printf(HEstring(status)); ++ printf("%s",HEstring(status)); + exit(0); + } + + if ((status = Vstart(file_id)) == -1) { + printf("Could not start VGroup interface\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + exit(-1); + } + +@@ -99,7 +99,7 @@ char *GIFFileName; + status = Vsetattr (vgroup_id, "Global Palette" , DFNT_UINT8, 3 * gifHead.TableSize , (VOIDP)gifHead.HDFPalette); + if (status) { + printf("Could not add global palette.\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + } + } + for (i = 0 ; i < CommentCount ; i++) { +@@ -144,14 +144,14 @@ char *GIFFileName; + /* GRSetCompress */ + if ((status = GRsetcompress(ri_id, comp_type, &c_info)) == -1) { + printf("Error occured while setting compression\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + exit(-1); + } + + /* Write the GR Image */ + if ((status = GRwriteimage(ri_id, start, NULL, edges, (VOIDP)gifImageDesc.Image)) == -1) { + printf("Error occured while trying to write GR image\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + exit(-1); + } + +@@ -160,7 +160,7 @@ char *GIFFileName; + + if ((status = GRwritelut (pal_id , 3, DFNT_UINT8, interlace_mode, 256, (VOIDP)gifImageDesc.HDFPalette)) == -1) { + printf("Could not write palette\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + exit(-1); + } + +@@ -169,7 +169,7 @@ char *GIFFileName; + + if ((status = GRendaccess(ri_id)) == -1) { + printf("Could not terminate GR access\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + exit(-1); + } + +@@ -178,7 +178,7 @@ char *GIFFileName; + /* Adding GR to vgroup */ + if((status = Vaddtagref(vgroup_id,(int32)1965,gr_ref))==-1) { + printf("Could not add tag to Vgroup"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + } + + +@@ -187,28 +187,28 @@ char *GIFFileName; + /* Terminate GR access */ + if ((status = GRend (gr_id))==-1) { + printf("Could not end GR access\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + printf("Trying to continue (file may be corrupt)...\n"); + } + + /* Terminate access to the VGroup */ + if ((status = Vdetach(vgroup_id))==-1) { + printf("Could not detach Vgroup\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + printf("Trying to continure (file may be corrupt)...\n"); + } + + /* Terminate access to the V interface */ + if ((status = Vend(file_id))==-1) { + printf("Could not end VGroup access\n"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + printf("Trying to continure (file may be corrupt)... \n"); + } + + /* Close the HDF file */ + if ((status = Hclose (file_id))==-1) { + printf("Could not close HDF file. Fatal Error"); +- printf(HEstring(HEvalue(1))); ++ printf("%s",HEstring(HEvalue(1))); + return(-1); + } + return(0); +diff -up hdf-4.2.9/mfhdf/hdfimport/hdfimport.c.format hdf-4.2.9/mfhdf/hdfimport/hdfimport.c +--- hdf-4.2.9/mfhdf/hdfimport/hdfimport.c.format 2013-02-07 21:44:45.000000000 -0700 ++++ hdf-4.2.9/mfhdf/hdfimport/hdfimport.c 2014-02-01 08:54:54.512707178 -0700 +@@ -628,7 +628,7 @@ main(int argc, char *argv[]) + break; + case ERR: /* command syntax error */ + default: +- (void) fprintf(stderr, err2); ++ (void) fprintf(stderr, "%s", err2); + usage(argv[0]); + goto err; + } +@@ -639,7 +639,7 @@ main(int argc, char *argv[]) + */ + if (!outfile_named) + { +- (void) fprintf(stderr, err3); ++ (void) fprintf(stderr, "%s", err3); + usage(argv[0]); + goto err; + } +@@ -656,7 +656,7 @@ main(int argc, char *argv[]) + return(0); + + err: +- (void) fprintf(stderr, err4); ++ (void) fprintf(stderr, "%s", err4); + return(1); + } + +@@ -960,7 +960,7 @@ gdimen(struct infilesformat infile_info, + sds_name = (char *)HDmalloc(name_len+1); + if (sds_name == NULL) + { +- (void) fprintf(stderr, err6); ++ (void) fprintf(stderr, "%s", err6); + goto err; + } + +@@ -2227,7 +2227,7 @@ indexes(float32 *scale, int dim, int *id + */ + if ((midpt = (float32 *) HDmalloc((size_t) dim * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + for (i = 0; i < dim - 1; i++) +@@ -2329,13 +2329,13 @@ interp(struct Input *in, struct Raster * + */ + if ((hratio = (float32 *) HDmalloc((size_t) im->hres * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((vratio = (float32 *) HDmalloc((unsigned int) im->vres * + sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -2343,7 +2343,7 @@ interp(struct Input *in, struct Raster * + if ((dratio = (float32 *) HDmalloc((unsigned int) im->dres * + sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } +@@ -2355,13 +2355,13 @@ interp(struct Input *in, struct Raster * + if ((hinc = (int *) HDmalloc((unsigned int) im->hres * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((voff = (int *) HDmalloc((unsigned int) (im->vres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -2369,7 +2369,7 @@ interp(struct Input *in, struct Raster * + if ((doff = (int *) HDmalloc((unsigned int) (im->dres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } +@@ -2640,7 +2640,7 @@ palette(char *palfile) + */ + if (DFR8setpalette(pal)) + { +- (void) fprintf(stderr, err3); ++ (void) fprintf(stderr, "%s", err3); + goto err; + } + +@@ -2681,7 +2681,7 @@ pixrep(struct Input *in, struct Raster * + */ + if ((hidx = (int *) HDmalloc((unsigned int) (im->hres + 1) * sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + +@@ -2694,7 +2694,7 @@ pixrep(struct Input *in, struct Raster * + if ((vidx = (int *) HDmalloc((unsigned int) (im->vres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + +@@ -2711,7 +2711,7 @@ pixrep(struct Input *in, struct Raster * + if ((didx = (int *) HDmalloc((unsigned int) (im->dres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + +@@ -2725,7 +2725,7 @@ pixrep(struct Input *in, struct Raster * + if ((pix = (unsigned char *) HDmalloc((unsigned int) (in->dims[0] + 1))) == + NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + for (k = 0, odidx = didx[0] - 1; k < im->dres; k++) +@@ -2842,35 +2842,35 @@ alloc_data(VOIDP *data, int32 len, int o + case 5: /* NO_NE */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fprintf(stderr, "%s", alloc_err); + return FAIL; + } + break; + case 1: /* 64-bit float */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fprintf(stderr, "%s", alloc_err); + return FAIL; + } + break; + case 2: /* 32-bit integer */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fprintf(stderr, "%s", alloc_err); + return FAIL; + } + break; + case 3: /* 16-bit integer */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fprintf(stderr, "%s", alloc_err); + return FAIL; + } + break; + case 4: /* 8-bit integer */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fprintf(stderr, "%s", alloc_err); + return FAIL; + } + break; +@@ -2901,7 +2901,7 @@ write_SDS(int32 sds_id, struct Input *in + start[1] = 0; + if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0) + { +- (void) fprintf(stderr, write_err); ++ (void) fprintf(stderr, "%s", write_err); + return FAIL; + } + } +@@ -2916,7 +2916,7 @@ write_SDS(int32 sds_id, struct Input *in + start[2] = 0; + if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0) + { +- (void) fprintf(stderr, write_err); ++ (void) fprintf(stderr, "%s", write_err); + return FAIL; + } + } +@@ -3163,7 +3163,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.max, &in.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fprintf(stderr, "%s", err5a); + goto err; + } + +@@ -3191,7 +3191,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.fp64s.max, &in.fp64s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fprintf(stderr, "%s", err5a); + goto err; + } + +@@ -3220,7 +3220,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.in32s.max, &in.in32s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fprintf(stderr, "%s", err5a); + goto err; + } + +@@ -3248,7 +3248,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.in16s.max, &in.in16s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fprintf(stderr, "%s", err5a); + goto err; + } + +@@ -3276,7 +3276,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.in8s.max, &in.in8s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fprintf(stderr, "%s", err5a); + goto err; + } + +@@ -3296,7 +3296,7 @@ process(struct Options *opt) + /* close data set */ + if (SDendaccess(sds_id) == FAIL ) + { +- (void) fprintf(stderr, err6a); ++ (void) fprintf(stderr, "%s", err6a); + goto err; + } + +@@ -3322,7 +3322,7 @@ process(struct Options *opt) + im.hres = (opt->hres == 0) ? in.dims[0] : opt->hres; + if ((im.hres < in.dims[0]) && (opt->ctm == EXPAND)) + { +- (void) fprintf(stderr, err3a); ++ (void) fprintf(stderr, "%s", err3a); + (void) fprintf(stderr, err3b, "Horiz."); + (void) fprintf(stderr, err3c, "horiz."); + (void) fprintf(stderr, err3d, in.dims[0]); +@@ -3332,7 +3332,7 @@ process(struct Options *opt) + im.vres = (opt->vres == 0) ? in.dims[1] : opt->vres; + if ((im.vres < in.dims[1]) && (opt->ctm == EXPAND)) + { +- (void) fprintf(stderr, err3a); ++ (void) fprintf(stderr, "%s", err3a); + (void) fprintf(stderr, err3b, "Vert."); + (void) fprintf(stderr, err3c, "vert."); + (void) fprintf(stderr, err3d, in.dims[1]); +@@ -3347,7 +3347,7 @@ process(struct Options *opt) + if ((im.dres < in.dims[2]) && + (opt->ctm == EXPAND)) + { +- (void) fprintf(stderr, err3a); ++ (void) fprintf(stderr, "%s", err3a); + (void) fprintf(stderr, err3b, "Depth"); + (void) fprintf(stderr, err3c, "depth"); + (void) fprintf(stderr, err3d, +@@ -3359,7 +3359,7 @@ process(struct Options *opt) + len = im.hres * im.vres * im.dres; + if ((im.image = (unsigned char *) HDmalloc((unsigned int) len)) == NULL) + { +- (void) fprintf(stderr, err2); ++ (void) fprintf(stderr, "%s", err2); + goto err; + } + +@@ -3389,7 +3389,7 @@ process(struct Options *opt) + if (DFR8addimage(opt->outfile, ip, im.hres, + im.vres, DFTAG_RLE)) + { +- (void) fprintf(stderr, err4); ++ (void) fprintf(stderr, "%s", err4); + goto err; + } + } +@@ -3430,7 +3430,7 @@ process(struct Options *opt) + /* close the output file */ + if (SDend (sd_id) != 0) + { +- (void) fprintf(stderr, err6); ++ (void) fprintf(stderr, "%s", err6); + goto err; + } + +@@ -3519,13 +3519,13 @@ static int init_scales(struct Input * in + if ((in->hscale = (float32 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((in->vscale = (float32 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -3533,7 +3533,7 @@ static int init_scales(struct Input * in + if ((in->dscale = (float32 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } +@@ -3544,13 +3544,13 @@ static int init_scales(struct Input * in + if ((in->fp64s.hscale = (float64 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((in->fp64s.vscale = (float64 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -3558,7 +3558,7 @@ static int init_scales(struct Input * in + if ((in->fp64s.dscale = (float64 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } +@@ -3567,13 +3567,13 @@ static int init_scales(struct Input * in + if ((in->in32s.hscale = (int32 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((in->in32s.vscale = (int32 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -3581,7 +3581,7 @@ static int init_scales(struct Input * in + if ((in->in32s.dscale = (int32 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } +@@ -3591,13 +3591,13 @@ static int init_scales(struct Input * in + if ((in->in16s.hscale = (int16 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((in->in16s.vscale = (int16 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -3605,7 +3605,7 @@ static int init_scales(struct Input * in + if ((in->in16s.dscale = (int16 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } +@@ -3615,13 +3615,13 @@ static int init_scales(struct Input * in + if ((in->in8s.hscale = (int8 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if ((in->in8s.vscale = (int8 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + if (in->rank == 3) +@@ -3629,7 +3629,7 @@ static int init_scales(struct Input * in + if ((in->in8s.dscale = (int8 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fprintf(stderr, "%s", err1); + goto err; + } + } diff --git a/hdf-ppc.patch b/hdf-ppc.patch new file mode 100644 index 0000000..87360fe --- /dev/null +++ b/hdf-ppc.patch @@ -0,0 +1,189 @@ +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 new file mode 100644 index 0000000..bf71a8b --- /dev/null +++ b/hdf-ppc64le.patch @@ -0,0 +1,81 @@ +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-s390.patch b/hdf-s390.patch new file mode 100644 index 0000000..7593dd7 --- /dev/null +++ b/hdf-s390.patch @@ -0,0 +1,348 @@ +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 7fa948e..bdc83bc 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,168 +1,90 @@ -# No more Java on i686 -%ifarch %{java_arches} -%bcond_without java -%else -%bcond_with java -%endif - Name: hdf -Version: 4.3.0 -Release: 4%{?dist} +Version: 4.2.10 +Release: 7%{?dist} Summary: A general purpose library and file format for storing scientific data -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD -URL: https://portal.hdfgroup.org/ -Source0: https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf%{version}.tar.gz -Source1: h4comp -# Fix java build -Patch1: hdf-build.patch +License: BSD +Group: System Environment/Libraries +URL: http://hdfgroup.org/products/hdf4/index.html +Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/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 +# Fix build with -Werror=format-security +# https://bugzilla.redhat.com/show_bug.cgi?id=1037120 +Patch7: hdf-format.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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # For destdir/examplesdir patches -BuildRequires: automake, libtool, gcc, gcc-c++ -BuildRequires: chrpath -BuildRequires: flex byacc libjpeg-devel zlib-devel %{!?el6:libaec-devel} -BuildRequires: libtirpc-devel -BuildRequires: gcc-gfortran, gcc -%if %{with java} -BuildRequires: java-devel -BuildRequires: javapackages-tools -BuildRequires: hamcrest -BuildRequires: junit -BuildRequires: slf4j +BuildRequires: automake libtool +BuildRequires: flex byacc libjpeg-devel zlib-devel +%if "%{?dist}" != ".el4" +BuildRequires: gcc-gfortran %else -Obsoletes: java-hdf < %{version}-%{release} +BuildRequires: gcc-g77 %endif -BuildRequires: make -Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description -HDF4 is a general purpose library and file format for storing scientific data. -HDF4 can store two primary objects: datasets and groups. A dataset is -essentially a multidimensional array of data elements, and a group is a -structure for organizing objects in an HDF4 file. Using these two basic -objects, one can create and store almost any kind of scientific data -structure, such as images, arrays of vectors, and structured and unstructured -grids. You can also mix and match them in HDF4 files according to your needs. +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 +essentially a multidimensional array of data elements, and a group is a +structure for organizing objects in an HDF file. Using these two basic +objects, one can create and store almost any kind of scientific data +structure, such as images, arrays of vectors, and structured and unstructured +grids. You can also mix and match them in HDF files according to your needs. %package devel -Summary: HDF4 development files +Summary: HDF development files +Group: Development/Libraries Provides: %{name}-static = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: libjpeg-devel%{?_isa} -Requires: libtirpc-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Requires: %{name} = %{version}-%{release} +Requires: libjpeg-devel zlib-devel %description devel -HDF4 development headers and libraries. - - -%package examples -Summary: HDF4 example source files -BuildArch: noarch - -%description examples -HDF4 example source files. - - -%package libs -Summary: HDF4 shared libraries - -%description libs -HDF4 shared libraries. - - -%package static -Summary: HDF4 static libraries -Requires: %{name}-devel = %{version}-%{release} - -%description static -HDF4 static libraries. - - -%if %{with java} -%package -n java-hdf -Summary: HDF4 java library -Requires: slf4j -Obsoletes: jhdf < 3.3.1-2 - -%description -n java-hdf -HDF4 java library -%endif +HDF development headers and libraries. %prep -%setup -q -n hdf4-hdf%{version} -%patch -P 1 -p1 -b .build - -%if %{with java} -# Replace jars with system versions -# hamcrest-core is obsoleted in hamcrest-2.2 -# Junit tests are failing with junit-4.13.1 -%if 0%{?rhel} >= 9 || 0%{?fedora} -find . ! -name junit.jar -name "*.jar" -delete -ln -s $(build-classpath hamcrest) java/lib/hamcrest-core.jar -%else -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 -junit_ver=$(sed -n '//{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom) -sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt -%endif -ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-1.7.33.jar -ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-1.7.33.jar -ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-1.7.33.jar -%endif - -find . -type f -name "*.h" -exec chmod 0644 '{}' \; -find . -type f -name "*.c" -exec chmod 0644 '{}' \; +%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 +%patch7 -p1 -b .format +%patch8 -p1 -b .aarch64 +%patch9 -p1 -b .ppc64le +chmod a-x *hdf/*/*.c hdf/*/*.h # restore include file timestamps modified by patching -#touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h +touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h %build -# This should be removed once rebased to an upstream version with -# C99 compatibility fixes (bug 2167466). -#global build_type_safety_c 0 - # For destdir/examplesdir patches autoreconf -vif - # avoid upstream compiler flags settings rm config/*linux-gnu +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none" +%configure --disable-production --disable-netcdf \ + --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name} -# TODO: upstream fix -# libmfhdf.so is link to libdf.so -export CFLAGS="%{optflags} -std=gnu17 -I%{_usr}/include/tirpc" -export LIBS="-ltirpc" -%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 %{?with_java:--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 -# Java requires shared libraries, fortran requires static - -# Temporary workaround for compiling on GCC-10 -%if 0%{?fedora} || 0%{?rhel} > 8 -export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" -export FFLAGS="%{build_fflags} -fallow-argument-mismatch" -%endif -%configure --disable-production --disable-java --disable-netcdf \ - --enable-shared=no --enable-static=yes --enable-fortran %{!?el6:--with-szlib} \ - --includedir=%{_includedir}/%{name} -%make_build -cd - - +make # correct the timestamps based on files used to generate the header files touch -c -r hdf/src/hdf.inc hdf/src/hdf.f90 touch -c -r hdf/src/dffunc.inc hdf/src/dffunc.f90 @@ -171,240 +93,51 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 %install -%make_install -C build-static -%make_install -C build-shared -chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || : - -#install -pm 644 README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/ - -rm -f %{buildroot}%{_libdir}/%{name}/*.la -rm -f %{buildroot}%{_libdir}/*.la - +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' #Don't conflict with netcdf +#rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc* for file in ncdump ncgen; do - mv %{buildroot}%{_bindir}/$file %{buildroot}%{_bindir}/h$file + mv $RPM_BUILD_ROOT%{_bindir}/$file $RPM_BUILD_ROOT%{_bindir}/h$file # man pages are the same than netcdf ones - rm %{buildroot}%{_mandir}/man1/${file}.1 + rm $RPM_BUILD_ROOT%{_mandir}/man1/${file}.1 done -#Fixup headers and scripts for multiarch -%if "%{_lib}" == "lib64" -for x in h4cc h4fc -do - mv %{buildroot}%{_bindir}/${x} \ - %{buildroot}%{_bindir}/${x}-64 - install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x} -done -%else -for x in h4cc h4fc -do - mv %{buildroot}%{_bindir}/${x} \ - %{buildroot}%{_bindir}/${x}-32 - install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x} -done -%endif +# this is done to have the same timestamp on multiarch setups +touch -c -r README.txt $RPM_BUILD_ROOT/%{_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 $RPM_BUILD_ROOT/%{_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 %check -# https://github.com/HDFGroup/hdf4/issues/473 -%ifarch ppc64le s390x -make -j1 -C build-shared check || : -make -j1 -C build-static check || : -%else -make -j1 -C build-shared check -make -j1 -C build-static check -%endif +make check + + +%clean +rm -rf $RPM_BUILD_ROOT %files -%license COPYING -%doc README.md release_notes/*.txt +%defattr(-,root,root,0755) +%doc COPYING MANIFEST README.txt release_notes/*.txt +%exclude %{_defaultdocdir}/%{name}/examples %{_bindir}/* -%exclude %{_bindir}/h4?c* -%{_libdir}/*.so.0* +%{_mandir}/man1/*.gz %files devel -%{_bindir}/h4?c* +%defattr(-,root,root,0755) %{_includedir}/%{name}/ -%{_libdir}/*.so -%{_libdir}/*.settings - -%files examples -%doc HDF4Examples - -%files libs -%{_libdir}/*.so.0* - -%files static -%{_libdir}/*.a - -%if %{with java} -%files -n java-hdf -%{_jnidir}/hdf.jar -%{_libdir}/%{name}/libhdf_java.so -%endif +%{_libdir}/%{name}/ +%{_defaultdocdir}/%{name}/examples %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 4.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Antonio Trande - 4.3.0-3 -- Fix GCC15 builds - -* Fri Jan 17 2025 Fedora Release Engineering - 4.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Sep 30 2024 Orion Poplawski - 4.3.0-1 -- Update to 4.3.0 - -* Mon Sep 02 2024 Miroslav Suchý - 4.2.16.2-3 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 4.2.16.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jan 30 2024 Orion Poplawski - 4.2.16.2-1 -- Update to 4.2.16-2 - -* Wed Jan 24 2024 Fedora Release Engineering - 4.2.15-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 4.2.15-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Aug 29 2023 Florian Weimer - 4.2.15-14 -- Set build_type_safety_c to 0 (#2167466) - -* Thu Jul 20 2023 Fedora Release Engineering - 4.2.15-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 4.2.15-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 4.2.15-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jul 10 2022 Orion Poplawski - 4.2.15-10 -- Drop java for i686 (bz#2104047) - -* Sat Feb 05 2022 Jiri Vanek - 4.2.15-9 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 4.2.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 29 2021 Antonio Trande - 4.2.15-7 -- Fix eln builds - -* Wed Jul 28 2021 Antonio Trande - 4.2.15-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -- Use bundled junit -- Fix hamcrest symlinks in Fedora 35+ - -* Sun May 30 2021 Orion Poplawski - 4.2.15-5 -- Handle junit versions better - -* Tue Jan 26 2021 Fedora Release Engineering - 4.2.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 4.2.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 21 2020 Merlin Mathesius - 4.2.15-2 -- Minor conditional fix for ELN - -* Fri Jul 10 2020 Jiri Vanek - 4.2.15-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri May 01 2020 Orion Poplawski - 4.2.15-1 -- Update to 4.2.15 - -* Thu Apr 02 2020 Björn Esser - 4.2.14-9 -- Fix string quoting for rpm >= 4.16 - -* Sun Feb 02 2020 Antonio Trande 4.2.14-8 -- Temporary workaround for compiling with GCC-10 - -* Wed Jan 29 2020 Fedora Release Engineering - 4.2.14-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 8 2019 Orion Poplawski - 4.2.14-6 -- Move compile scripts to hdf-devel and allow multilib install (bz#1769326) -- Split shared libraries into hdf-libs sub-package - -* Thu Jul 25 2019 Fedora Release Engineering - 4.2.14-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Apr 10 2019 Orion Poplawski - 4.2.14-4 -- Move libraries into %%{_libdir} - -* Tue Apr 9 2019 Orion Poplawski - 4.2.14-3 -- Build shared libraries -- Enable java - -* Fri Feb 01 2019 Fedora Release Engineering - 4.2.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Nov 03 2018 Antonio Trande 4.2.14-1 -- Release 4.2.14 - -* Sun Oct 7 2018 Orion Poplawski - 4.2.13-11 -- Use LIBS instead of LDFLAGS for -ltirpc - -* Fri Jul 13 2018 Fedora Release Engineering - 4.2.13-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 22 2018 Antonio Trande - 4.2.13-9 -- Add gcc BR - -* Wed Feb 07 2018 Fedora Release Engineering - 4.2.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 5 2018 Orion Poplawski - 4.2.13-7 -- Make hdf-devel require libtirpc-devel - -* Fri Feb 02 2018 Orion Poplawski - 4.2.13-6 -- Rebuild for gcc 8.0 - -* Sat Jan 20 2018 Antonio Trande 4.2.13-5 -- Enable szlib support - -* Wed Jan 17 2018 Pavel Raiskup - 4.2.13-4 -- rpc api moved from glibc to libtirpc: - https://fedoraproject.org/wiki/Changes/SunRPCRemoval - -* Wed Aug 02 2017 Fedora Release Engineering - 4.2.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.2.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Antonio Trande 4.2.13-1 -- Update to 4.2.13 - -* Fri Feb 10 2017 Fedora Release Engineering - 4.2.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 31 2017 Orion Poplawski 4.2.12-1 -- Update to 4.2.12 - -* Wed May 25 2016 Orion Poplawski 4.2.11-4 -- Cleanup spec -- Remove .la files -- Use %%license - -* Wed Feb 03 2016 Fedora Release Engineering - 4.2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 4.2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 Orion Poplawski 4.2.11-1 -- Update to 4.2.11 -- Drop format patch applied upstream -- Update destdir patch - * Mon Sep 8 2014 Orion Poplawski - 4.2.10-7 - Updated patch for ppc64le support (bug #1134385) diff --git a/sources b/sources index 779b64a..e83e9d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hdf4.3.0.tar.gz) = dd1c433a393d893744c29479c756331e677d4201bb0e89f64b846d6c5d9a4fcee64e99b4ed46a97741b55cf0917002f00d8fa2582db5570aa0d6eb202242a558 +bf26b3caaf3c0090965c8995578375bd hdf-4.2.10.tar.bz2