Compare commits
19 Commits
master
...
f37-riscv6
Author | SHA1 | Date | |
---|---|---|---|
c5c5cb0ad0 | |||
|
0678602e77 | ||
|
83d2526353 | ||
|
117cf570cf | ||
|
d051a6b402 | ||
|
3313aff0d3 | ||
|
c8ec4e6abb | ||
|
aed1f4ba8b | ||
|
50f5ee1428 | ||
|
ddad9d7740 | ||
|
d25c0ddcd0 | ||
|
8296ec0626 | ||
|
b8d1f3a43a | ||
|
edbe5f4964 | ||
|
ca5d64a2d2 | ||
|
71d623dbfa | ||
|
ca49a5638b | ||
|
f83322e165 | ||
|
4fe0dd43c5 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ hdf-4.2.5.tar.bz2
|
||||
/hdf-4.2.12.tar.bz2
|
||||
/hdf-4.2.13.tar.bz2
|
||||
/hdf-4.2.14.tar.bz2
|
||||
/hdf-4.2.15.tar.bz2
|
||||
|
308
hdf-4.2.15-riscv64.patch
Normal file
308
hdf-4.2.15-riscv64.patch
Normal file
@ -0,0 +1,308 @@
|
||||
diff --git a/hdf/src/hconv.h b/hdf/src/hconv.h
|
||||
index d6a8748..7c4c17a 100644
|
||||
--- a/hdf/src/hconv.h
|
||||
+++ b/hdf/src/hconv.h
|
||||
@@ -59,7 +59,7 @@
|
||||
/* CONSTANT DEFINITIONS */
|
||||
/*****************************************************************************/
|
||||
/* Generally Big-Endian machines */
|
||||
-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) && !defined(__LITTLE_ENDIAN__)
|
||||
+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) && !defined(__riscv) && !defined(__LITTLE_ENDIAN__)
|
||||
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
|
||||
# define UI8_OUT DFKnb1b
|
||||
# define SI16_IN DFKnb2b /* S = Signed */
|
||||
diff --git a/hdf/src/hdfi.h b/hdf/src/hdfi.h
|
||||
index 27436ff..c85e6db 100644
|
||||
--- a/hdf/src/hdfi.h
|
||||
+++ b/hdf/src/hdfi.h
|
||||
@@ -81,6 +81,7 @@
|
||||
#define DFMT_LINUX390 0x1111
|
||||
#define DFMT_LINUXARM 0x4441
|
||||
#define DFMT_LINUXAARCH64 0x4441
|
||||
+#define DFMT_LINUXRISCV64 0x4441
|
||||
|
||||
/* I/O library constants */
|
||||
#define UNIXUNBUFIO 1
|
||||
@@ -1388,6 +1389,57 @@ typedef long hdf_pint_t; /* an integer the same size as a pointer
|
||||
#endif
|
||||
#endif /* Linux AArch64 */
|
||||
|
||||
+/* Linux RISCV64 */
|
||||
+#if defined(__riscv) && __riscv_xlen == 64
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE
|
||||
+
|
||||
+#include <sys/file.h> /* for unbuffered i/o stuff */
|
||||
+#include <sys/stat.h>
|
||||
+#define DF_MT DFMT_LINUXRISCV64
|
||||
+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 RISCV64 */
|
||||
+
|
||||
#ifndef GOT_MACHINE
|
||||
No machine type has been defined. Your Makefile needs to have someing like
|
||||
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
|
||||
diff --git a/mfhdf/fortran/jackets.c.in b/mfhdf/fortran/jackets.c.in
|
||||
index 77f2ad7..deb15b5 100644
|
||||
--- a/mfhdf/fortran/jackets.c.in
|
||||
+++ b/mfhdf/fortran/jackets.c.in
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a common block from Fortran */
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims)
|
||||
}
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
/*
|
||||
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
||||
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
||||
@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rcode)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs = *(int *)value;
|
||||
@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value, rcode)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stride, basis, value, rcode)
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stride, basis, value, rcode)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rcode)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs;
|
||||
@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value, rcode)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stride, basis, value, rcode)
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stride, basis, value, rcode)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, attlen, value, rcode, attnamelen)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, attlen, 1);
|
||||
@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rcode, attnamelen)
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
||||
diff --git a/mfhdf/libsrc/netcdf.h.in b/mfhdf/libsrc/netcdf.h.in
|
||||
index efe7039..2bf2308 100644
|
||||
--- a/mfhdf/libsrc/netcdf.h.in
|
||||
+++ b/mfhdf/libsrc/netcdf.h.in
|
||||
@@ -293,7 +293,7 @@ typedef double ncdouble;
|
||||
/*
|
||||
* Variables/attributes of type NC_LONG should use the C type 'nclong'
|
||||
*/
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
/*
|
||||
* LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
|
||||
* http://www.unix.org/version2/whatsnew/lp64_wp.html
|
||||
diff --git a/mfhdf/libsrc/putget.c b/mfhdf/libsrc/putget.c
|
||||
index 1def264..5452f86 100644
|
||||
--- a/mfhdf/libsrc/putget.c
|
||||
+++ b/mfhdf/libsrc/putget.c
|
||||
@@ -665,7 +665,7 @@ Void *values ;
|
||||
case NC_SHORT :
|
||||
return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
|
||||
case NC_LONG :
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__|| (__riscv_xlen == 64)
|
||||
return( xdr_int(xdrs, (nclong *)values) ) ;
|
||||
#else
|
||||
return( xdr_long(xdrs, (nclong *)values) ) ;
|
||||
diff --git a/mfhdf/libsrc/xdrposix.c b/mfhdf/libsrc/xdrposix.c
|
||||
index 29b06a7..0f0b7cc 100644
|
||||
--- a/mfhdf/libsrc/xdrposix.c
|
||||
+++ b/mfhdf/libsrc/xdrposix.c
|
||||
@@ -262,7 +262,7 @@ int nbytes;
|
||||
|
||||
static bool_t xdrposix_getlong();
|
||||
static bool_t xdrposix_putlong();
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
static bool_t xdrposix_getint();
|
||||
static bool_t xdrposix_putint();
|
||||
#endif
|
||||
@@ -276,7 +276,7 @@ static long * xdrposix_inline();
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t * xdrposix_inline();
|
||||
#else
|
||||
-#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
static int32_t * xdrposix_inline();
|
||||
#else
|
||||
static netlong * xdrposix_inline();
|
||||
@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||
xdrposix_getpos, /* get offset in the stream */
|
||||
xdrposix_setpos, /* set offset in the stream */
|
||||
xdrposix_inline, /* prime stream for inline macros */
|
||||
-#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
xdrposix_destroy, /* destroy stream */
|
||||
-#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) && !(defined __aarch64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) && !(defined __aarch64__) && !(defined __riscv) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
NULL, /* no xdr_control function defined */
|
||||
#endif
|
||||
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
||||
@@ -560,7 +560,7 @@ static long *
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t *
|
||||
#else
|
||||
-#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
static int32_t *
|
||||
#else
|
||||
static netlong *
|
||||
@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
|
||||
static bool_t
|
||||
xdrposix_getint(xdrs, lp)
|
||||
diff --git a/mfhdf/ncgen/ncgen.l b/mfhdf/ncgen/ncgen.l
|
||||
index 6912087..bef3dd8 100644
|
||||
--- a/mfhdf/ncgen/ncgen.l
|
||||
+++ b/mfhdf/ncgen/ncgen.l
|
||||
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float missing values */
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
diff --git a/mfhdf/ncgen/ncgenyy.c b/mfhdf/ncgen/ncgenyy.c
|
||||
index 559c30b..adc9d39 100644
|
||||
--- a/mfhdf/ncgen/ncgenyy.c
|
||||
+++ b/mfhdf/ncgen/ncgenyy.c
|
||||
@@ -991,7 +991,7 @@ YY_RULE_SETUP
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || defined __aarch64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || defined __aarch64__ || (__riscv_xlen == 64)
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
@ -1,7 +1,6 @@
|
||||
Index: hdf-4.2.10/hdf/src/hconv.h
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/hdf/src/hconv.h
|
||||
+++ hdf-4.2.10/hdf/src/hconv.h
|
||||
diff -up hdf-4.2.15/hdf/src/hconv.h.aarch64 hdf-4.2.15/hdf/src/hconv.h
|
||||
--- hdf-4.2.15/hdf/src/hconv.h.aarch64 2020-04-30 21:16:25.325499508 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:16:25.338499580 -0600
|
||||
@@ -59,7 +59,7 @@
|
||||
/* CONSTANT DEFINITIONS */
|
||||
/*****************************************************************************/
|
||||
@ -11,10 +10,9 @@ Index: hdf-4.2.10/hdf/src/hconv.h
|
||||
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
|
||||
# define UI8_OUT DFKnb1b
|
||||
# define SI16_IN DFKnb2b /* S = Signed */
|
||||
Index: hdf-4.2.10/hdf/src/hdfi.h
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/hdf/src/hdfi.h
|
||||
+++ hdf-4.2.10/hdf/src/hdfi.h
|
||||
diff -up hdf-4.2.15/hdf/src/hdfi.h.aarch64 hdf-4.2.15/hdf/src/hdfi.h
|
||||
--- hdf-4.2.15/hdf/src/hdfi.h.aarch64 2020-04-30 21:16:25.326499514 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:16:25.340499591 -0600
|
||||
@@ -79,6 +79,7 @@
|
||||
#define DFMT_LINUXSPARC 0x1111
|
||||
#define DFMT_LINUX390 0x1111
|
||||
@ -23,7 +21,7 @@ Index: hdf-4.2.10/hdf/src/hdfi.h
|
||||
|
||||
/* I/O library constants */
|
||||
#define UNIXUNBUFIO 1
|
||||
@@ -1337,6 +1338,44 @@ typedef long hdf_pint_t;
|
||||
@@ -1341,6 +1342,44 @@ typedef long hdf_pint_t;
|
||||
|
||||
#endif /* IA64 */
|
||||
|
||||
@ -68,22 +66,21 @@ Index: hdf-4.2.10/hdf/src/hdfi.h
|
||||
#ifndef GOT_MACHINE
|
||||
No machine type has been defined. Your Makefile needs to have someing like
|
||||
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
|
||||
Index: hdf-4.2.10/mfhdf/fortran/jackets.c.in
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/fortran/jackets.c.in
|
||||
+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in
|
||||
diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 hdf-4.2.15/mfhdf/fortran/jackets.c.in
|
||||
--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.aarch64 2020-04-30 21:16:25.318499470 -0600
|
||||
+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:20:28.346831868 -0600
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
@ -100,127 +97,102 @@ Index: hdf-4.2.10/mfhdf/fortran/jackets.c.in
|
||||
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
||||
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
||||
@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs = *(int *)value;
|
||||
long longs = *(int *)value;
|
||||
@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs;
|
||||
long longs;
|
||||
@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype,
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, attlen, 1);
|
||||
long *longs = itol (value, attlen, 1);
|
||||
@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
||||
Index: hdf-4.2.10/mfhdf/libsrc/array.c
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/libsrc/array.c
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/array.c
|
||||
@@ -620,7 +620,7 @@ xdr_NC_array(xdrs, app)
|
||||
xdr_NC_fnct = xdr_shorts ;
|
||||
goto func ;
|
||||
case NC_LONG :
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
xdr_NC_fnct = xdr_int ;
|
||||
#else
|
||||
xdr_NC_fnct = xdr_long ;
|
||||
Index: hdf-4.2.10/mfhdf/libsrc/cdf.c
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/libsrc/cdf.c
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/cdf.c
|
||||
@@ -3662,7 +3662,7 @@ NC_var *vp ;
|
||||
break ;
|
||||
case NC_LONG :
|
||||
alen /= 4 ;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
xdr_NC_fnct = xdr_int ;
|
||||
#else
|
||||
xdr_NC_fnct = xdr_long ;
|
||||
Index: hdf-4.2.10/mfhdf/libsrc/netcdf.h.in
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/libsrc/netcdf.h.in
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/netcdf.h.in
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/array.c.aarch64 hdf-4.2.15/mfhdf/libsrc/array.c
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.aarch64 hdf-4.2.15/mfhdf/libsrc/cdf.c
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in
|
||||
--- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.aarch64 2020-04-30 21:16:25.347499629 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:24:11.366838259 -0600
|
||||
@@ -293,7 +293,7 @@ typedef double ncdouble;
|
||||
/*
|
||||
/*
|
||||
* Variables/attributes of type NC_LONG should use the C type 'nclong'
|
||||
*/
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
@ -228,33 +200,22 @@ Index: hdf-4.2.10/mfhdf/libsrc/netcdf.h.in
|
||||
/*
|
||||
* LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
|
||||
* http://www.unix.org/version2/whatsnew/lp64_wp.html
|
||||
Index: hdf-4.2.10/mfhdf/libsrc/putget.c
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/libsrc/putget.c
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/putget.c
|
||||
@@ -664,7 +664,7 @@ Void *values ;
|
||||
case NC_SHORT :
|
||||
return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
|
||||
case NC_LONG :
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return( xdr_int(xdrs, (nclong *)values) ) ;
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 hdf-4.2.15/mfhdf/libsrc/putget.c
|
||||
--- hdf-4.2.15/mfhdf/libsrc/putget.c.aarch64 2020-04-30 21:16:25.349499640 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:21:11.344052951 -0600
|
||||
@@ -665,7 +665,7 @@ Void *values ;
|
||||
case NC_SHORT :
|
||||
return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
|
||||
case NC_LONG :
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
return( xdr_int(xdrs, (nclong *)values) ) ;
|
||||
#else
|
||||
return( xdr_long(xdrs, (nclong *)values) ) ;
|
||||
@@ -1975,7 +1975,7 @@ Void *values ;
|
||||
} /* else */
|
||||
return(TRUE) ;
|
||||
case NC_LONG :
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
xdr_NC_fnct = xdr_int ;
|
||||
#else
|
||||
xdr_NC_fnct = xdr_long ;
|
||||
Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/libsrc/xdrposix.c
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
@@ -250,7 +250,7 @@ int nbytes;
|
||||
return( xdr_long(xdrs, (nclong *)values) ) ;
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 hdf-4.2.15/mfhdf/libsrc/xdrposix.c
|
||||
--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.aarch64 2020-04-30 21:16:25.321499486 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:23:48.397752506 -0600
|
||||
@@ -262,7 +262,7 @@ int nbytes;
|
||||
|
||||
static bool_t xdrposix_getlong();
|
||||
static bool_t xdrposix_putlong();
|
||||
@ -263,7 +224,7 @@ Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
static bool_t xdrposix_getint();
|
||||
static bool_t xdrposix_putint();
|
||||
#endif
|
||||
@@ -264,7 +264,7 @@ static long * xdrposix_inline();
|
||||
@@ -276,7 +276,7 @@ static long * xdrposix_inline();
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t * xdrposix_inline();
|
||||
#else
|
||||
@ -271,29 +232,29 @@ Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
static int32_t * xdrposix_inline();
|
||||
#else
|
||||
#if (defined __alpha )
|
||||
@@ -294,9 +294,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||
static netlong * xdrposix_inline();
|
||||
@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||
xdrposix_getpos, /* get offset in the stream */
|
||||
xdrposix_setpos, /* set offset in the stream */
|
||||
xdrposix_inline, /* prime stream for inline macros */
|
||||
-#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
xdrposix_destroy, /* destroy stream */
|
||||
-#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
+#if !(defined __aarch64__) && !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
-#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) && !(defined __aarch64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
NULL, /* no xdr_control function defined */
|
||||
#endif
|
||||
#endif
|
||||
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
||||
@@ -552,7 +552,7 @@ static rpc_inline_t *
|
||||
#if (defined __alpha)
|
||||
static int*
|
||||
@@ -560,7 +560,7 @@ static long *
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t *
|
||||
#else
|
||||
-#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
||||
+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
static int32_t *
|
||||
static int32_t *
|
||||
#else
|
||||
static netlong *
|
||||
@@ -580,7 +580,7 @@ int
|
||||
static netlong *
|
||||
@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
@ -302,29 +263,27 @@ Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
|
||||
static bool_t
|
||||
xdrposix_getint(xdrs, lp)
|
||||
Index: hdf-4.2.10/mfhdf/ncgen/ncgen.l
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/ncgen/ncgen.l
|
||||
+++ hdf-4.2.10/mfhdf/ncgen/ncgen.l
|
||||
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss
|
||||
yyerror(errstr);
|
||||
}
|
||||
diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgen.l
|
||||
--- hdf-4.2.15/mfhdf/ncgen/ncgen.l.aarch64 2020-04-30 21:16:25.376499789 -0600
|
||||
+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:17:29.876854089 -0600
|
||||
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
Index: hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
|
||||
===================================================================
|
||||
--- hdf-4.2.10.orig/mfhdf/ncgen/ncgenyy.c
|
||||
+++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
|
||||
@@ -989,7 +989,7 @@ YY_RULE_SETUP
|
||||
yyerror(errstr);
|
||||
}
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c
|
||||
--- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.aarch64 2020-04-30 21:16:25.382499822 -0600
|
||||
+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:18:12.880090311 -0600
|
||||
@@ -991,7 +991,7 @@ YY_RULE_SETUP
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || __aarch64__
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ || defined __aarch64__
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
@ -1,17 +0,0 @@
|
||||
--- configure.orig.ac 2017-06-24 23:00:04.000000000 +0200
|
||||
+++ configure.ac 2017-07-21 22:13:19.695919835 +0200
|
||||
@@ -264,10 +264,10 @@
|
||||
JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR"
|
||||
done
|
||||
## Find junit for testing the JNI code
|
||||
- AX_CHECK_CLASSPATH()
|
||||
- CLASSPATH_ENV=$H4_CLASSPATH
|
||||
- AX_CHECK_JUNIT()
|
||||
- AX_CHECK_JAVA_HOME
|
||||
+ ## AX_CHECK_CLASSPATH()
|
||||
+ ## CLASSPATH_ENV=$H4_CLASSPATH
|
||||
+ ## AX_CHECK_JUNIT()
|
||||
+ ## AX_CHECK_JAVA_HOME
|
||||
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
@ -1,6 +1,6 @@
|
||||
diff -up hdf-4.2.14/java/examples/Makefile.am.build hdf-4.2.14/java/examples/Makefile.am
|
||||
--- hdf-4.2.14/java/examples/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
||||
+++ hdf-4.2.14/java/examples/Makefile.am 2019-04-10 20:01:42.336828053 -0600
|
||||
diff -up hdf-4.2.15/java/examples/Makefile.am.build hdf-4.2.15/java/examples/Makefile.am
|
||||
--- hdf-4.2.15/java/examples/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/java/examples/Makefile.am 2020-04-30 21:34:13.856216928 -0600
|
||||
@@ -12,8 +12,8 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
@ -10,13 +10,13 @@ diff -up hdf-4.2.14/java/examples/Makefile.am.build hdf-4.2.14/java/examples/Mak
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
+jarfile = $(PACKAGE_TARNAME)examples.jar
|
||||
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation
|
||||
diff -up hdf-4.2.14/java/src/jni/Makefile.am.build hdf-4.2.14/java/src/jni/Makefile.am
|
||||
--- hdf-4.2.14/java/src/jni/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
||||
+++ hdf-4.2.14/java/src/jni/Makefile.am 2019-04-10 20:47:55.397873538 -0600
|
||||
@@ -14,7 +14,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
|
||||
-I$(top_builddir)/mfhdf/libsrc -I$(top_srcdir)/java/src/jni $(JNIFLAGS)
|
||||
diff -up hdf-4.2.15/java/src/jni/Makefile.am.build hdf-4.2.15/java/src/jni/Makefile.am
|
||||
--- hdf-4.2.15/java/src/jni/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/java/src/jni/Makefile.am 2020-04-30 21:34:13.857216934 -0600
|
||||
@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
|
||||
$(JNIFLAGS) $(XDRINC)
|
||||
|
||||
# This is our main target
|
||||
-lib_LTLIBRARIES=libhdf_java.la
|
||||
@ -27,9 +27,9 @@ diff -up hdf-4.2.14/java/src/jni/Makefile.am.build hdf-4.2.14/java/src/jni/Makef
|
||||
|
||||
# Source files for the library
|
||||
libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
|
||||
diff -up hdf-4.2.14/java/src/Makefile.am.build hdf-4.2.14/java/src/Makefile.am
|
||||
--- hdf-4.2.14/java/src/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
||||
+++ hdf-4.2.14/java/src/Makefile.am 2019-04-10 20:01:42.336828053 -0600
|
||||
diff -up hdf-4.2.15/java/src/Makefile.am.build hdf-4.2.15/java/src/Makefile.am
|
||||
--- hdf-4.2.15/java/src/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/java/src/Makefile.am 2020-04-30 21:34:13.857216934 -0600
|
||||
@@ -13,8 +13,8 @@ JAVAROOT = .classes
|
||||
classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
@ -40,12 +40,12 @@ diff -up hdf-4.2.14/java/src/Makefile.am.build hdf-4.2.14/java/src/Makefile.am
|
||||
+hdf_javadir = $(prefix)/lib/java
|
||||
|
||||
pkgpath = hdf/hdflib
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$$CLASSPATH
|
||||
diff -up hdf-4.2.14/java/test/junit.sh.in.build hdf-4.2.14/java/test/junit.sh.in
|
||||
--- hdf-4.2.14/java/test/junit.sh.in.build 2018-06-26 22:42:58.000000000 -0600
|
||||
+++ hdf-4.2.14/java/test/junit.sh.in 2019-04-10 20:01:42.337828056 -0600
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH
|
||||
diff -up hdf-4.2.15/java/test/junit.sh.in.build hdf-4.2.15/java/test/junit.sh.in
|
||||
--- hdf-4.2.15/java/test/junit.sh.in.build 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/java/test/junit.sh.in 2020-04-30 21:34:13.858216939 -0600
|
||||
@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
||||
BLDLIBDIR="$top_builddir/java/lib"
|
||||
BLDLIBDIR="$top_builddir/hdf4/lib"
|
||||
BLDDIR="."
|
||||
HDFTEST_HOME="$top_srcdir/java/test"
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
@ -53,15 +53,15 @@ diff -up hdf-4.2.14/java/test/junit.sh.in.build hdf-4.2.14/java/test/junit.sh.in
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
diff -up hdf-4.2.14/java/test/Makefile.am.build hdf-4.2.14/java/test/Makefile.am
|
||||
--- hdf-4.2.14/java/test/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
||||
+++ hdf-4.2.14/java/test/Makefile.am 2019-04-10 20:01:42.337828056 -0600
|
||||
diff -up hdf-4.2.15/java/test/Makefile.am.build hdf-4.2.15/java/test/Makefile.am
|
||||
--- hdf-4.2.15/java/test/Makefile.am.build 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/java/test/Makefile.am 2020-04-30 21:41:47.966938811 -0600
|
||||
@@ -12,7 +12,7 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = test
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)test.jar
|
||||
|
122
hdf-ppc.patch
122
hdf-ppc.patch
@ -1,6 +1,6 @@
|
||||
diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc hdf-4.2.10/hdf/src/hdfi.h
|
||||
--- hdf-4.2.10/hdf/src/hdfi.h.ppc 2014-02-09 19:28:49.000000000 -0700
|
||||
+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-14 09:14:52.564082472 -0700
|
||||
diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc hdf-4.2.15/hdf/src/hdfi.h
|
||||
--- hdf-4.2.15/hdf/src/hdfi.h.ppc 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:04:01.529561298 -0600
|
||||
@@ -75,6 +75,7 @@
|
||||
#define DFMT_IA64 0x4441
|
||||
#define DFMT_LINUX64 0x4441
|
||||
@ -9,7 +9,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc hdf-4.2.10/hdf/src/hdfi.h
|
||||
|
||||
/* I/O library constants */
|
||||
#define UNIXUNBUFIO 1
|
||||
@@ -1013,6 +1014,57 @@ typedef long hdf_pint_t;
|
||||
@@ -1017,6 +1018,57 @@ typedef long hdf_pint_t;
|
||||
|
||||
#endif /*Linux 64 */
|
||||
|
||||
@ -67,21 +67,21 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc hdf-4.2.10/hdf/src/hdfi.h
|
||||
/*-----------------------------------------------------*/
|
||||
/* 64-bit Free BSD */
|
||||
|
||||
diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.10/mfhdf/fortran/jackets.c.in
|
||||
--- hdf-4.2.10/mfhdf/fortran/jackets.c.in.ppc 2014-02-09 19:28:44.000000000 -0700
|
||||
+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in 2014-02-14 09:18:29.860919811 -0700
|
||||
diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.15/mfhdf/fortran/jackets.c.in
|
||||
--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.ppc 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:06:39.500403641 -0600
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
@ -98,92 +98,92 @@ diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.ppc hdf-4.2.10/mfhdf/fortran/jack
|
||||
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
||||
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
||||
@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs = *(int *)value;
|
||||
long longs = *(int *)value;
|
||||
@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs;
|
||||
long longs;
|
||||
@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype,
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, attlen, 1);
|
||||
long *longs = itol (value, attlen, 1);
|
||||
@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -up hdf-4.2.10/hdf/src/hconv.h.ppc64le hdf-4.2.10/hdf/src/hconv.h
|
||||
--- hdf-4.2.10/hdf/src/hconv.h.ppc64le 2014-09-03 20:30:36.598974138 -0600
|
||||
+++ hdf-4.2.10/hdf/src/hconv.h 2014-09-03 20:30:36.608974327 -0600
|
||||
diff -up hdf-4.2.15/hdf/src/hconv.h.ppc64le hdf-4.2.15/hdf/src/hconv.h
|
||||
--- hdf-4.2.15/hdf/src/hconv.h.ppc64le 2020-04-30 21:25:25.183973672 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:25:25.191973677 -0600
|
||||
@@ -59,7 +59,7 @@
|
||||
/* CONSTANT DEFINITIONS */
|
||||
/*****************************************************************************/
|
||||
@ -10,9 +10,9 @@ diff -up hdf-4.2.10/hdf/src/hconv.h.ppc64le hdf-4.2.10/hdf/src/hconv.h
|
||||
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
|
||||
# define UI8_OUT DFKnb1b
|
||||
# define SI16_IN DFKnb2b /* S = Signed */
|
||||
diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h
|
||||
--- hdf-4.2.10/hdf/src/hdfi.h.ppc64le 2014-09-03 20:30:36.599974157 -0600
|
||||
+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-09 19:28:49.000000000 -0700
|
||||
diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc64le hdf-4.2.15/hdf/src/hdfi.h
|
||||
--- hdf-4.2.15/hdf/src/hdfi.h.ppc64le 2020-04-30 21:25:25.183973672 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:25:25.192973677 -0600
|
||||
@@ -75,6 +75,7 @@
|
||||
#define DFMT_IA64 0x4441
|
||||
#define DFMT_LINUX64 0x4441
|
||||
@ -21,7 +21,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h
|
||||
#define DFMT_LINUXPPC 0x1111
|
||||
#define DFMT_LINUXSPARC 0x1111
|
||||
#define DFMT_LINUX390 0x1111
|
||||
@@ -922,18 +923,24 @@ typedef int hdf_pint_t;
|
||||
@@ -926,18 +927,24 @@ typedef int hdf_pint_t;
|
||||
|
||||
|
||||
/*-----------------------------------------------------*/
|
||||
@ -49,7 +49,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h
|
||||
typedef void VOID;
|
||||
typedef void *VOIDP;
|
||||
typedef char *_fcd;
|
||||
@@ -969,8 +976,9 @@ typedef long hdf_pint_t;
|
||||
@@ -973,8 +980,9 @@ typedef long hdf_pint_t;
|
||||
#define INCLUDES_ARE_ANSI
|
||||
#endif
|
||||
|
||||
@ -60,18 +60,19 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h
|
||||
/* Linux 64 */
|
||||
#if defined(__linux__) && defined __x86_64__ && !(defined SUN) /* i.e. 64-bit Linux but not SunOS on Intel */
|
||||
|
||||
--- hdf-4.2.10/mfhdf/libsrc/xdrposix.c.patched
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
@@ -431,7 +431,7 @@ xdrposix_getlong(xdrs, lp)
|
||||
#endif
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le hdf-4.2.15/mfhdf/libsrc/xdrposix.c
|
||||
--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le 2020-04-30 21:25:25.186973674 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:26:18.190001127 -0600
|
||||
@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp)
|
||||
long *lp;
|
||||
{
|
||||
unsigned char *up = (unsigned char *)lp ;
|
||||
-#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
-#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
*lp = 0 ;
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
@@ -458,7 +458,7 @@ xdrposix_putlong(xdrs, lp)
|
||||
@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp)
|
||||
netlong mycopy = htonl(*lp);
|
||||
up = (unsigned char *)&mycopy;
|
||||
#endif
|
||||
@ -79,3 +80,4 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.ppc64le hdf-4.2.10/hdf/src/hdfi.h
|
||||
+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
|
||||
|
259
hdf-s390.patch
259
hdf-s390.patch
@ -1,6 +1,6 @@
|
||||
diff -up hdf-4.2.10/hdf/src/hdfi.h.s390 hdf-4.2.10/hdf/src/hdfi.h
|
||||
--- hdf-4.2.10/hdf/src/hdfi.h.s390 2014-02-14 09:20:40.521202091 -0700
|
||||
+++ hdf-4.2.10/hdf/src/hdfi.h 2014-02-14 09:20:40.525202067 -0700
|
||||
diff -up hdf-4.2.15/hdf/src/hdfi.h.s390 hdf-4.2.15/hdf/src/hdfi.h
|
||||
--- hdf-4.2.15/hdf/src/hdfi.h.s390 2020-04-30 21:07:16.946922845 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:07:16.950922901 -0600
|
||||
@@ -77,6 +77,7 @@
|
||||
#define DFMT_POWERPC64 0x1111
|
||||
#define DFMT_LINUXPPC 0x1111
|
||||
@ -9,7 +9,7 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.s390 hdf-4.2.10/hdf/src/hdfi.h
|
||||
|
||||
/* I/O library constants */
|
||||
#define UNIXUNBUFIO 1
|
||||
@@ -1126,6 +1127,66 @@ typedef int hdf_pint_t;
|
||||
@@ -1130,6 +1131,66 @@ typedef int hdf_pint_t;
|
||||
|
||||
#endif /* Linux Sparc32/64 */
|
||||
|
||||
@ -76,21 +76,21 @@ diff -up hdf-4.2.10/hdf/src/hdfi.h.s390 hdf-4.2.10/hdf/src/hdfi.h
|
||||
/*-----------------------------------------------------*/
|
||||
/* 64-bit Free BSD */
|
||||
|
||||
diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.10/mfhdf/fortran/jackets.c.in
|
||||
--- hdf-4.2.10/mfhdf/fortran/jackets.c.in.s390 2014-02-14 09:20:40.518202109 -0700
|
||||
+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in 2014-02-14 09:23:08.002375061 -0700
|
||||
diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.15/mfhdf/fortran/jackets.c.in
|
||||
--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 2020-04-30 21:07:16.942922790 -0600
|
||||
+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:10:30.030640644 -0600
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
@ -107,124 +107,102 @@ diff -up hdf-4.2.10/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.10/mfhdf/fortran/jac
|
||||
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
||||
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
||||
@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs = *(int *)value;
|
||||
long longs = *(int *)value;
|
||||
@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs;
|
||||
long longs;
|
||||
@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype,
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, attlen, 1);
|
||||
long *longs = itol (value, attlen, 1);
|
||||
@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
||||
diff -up hdf-4.2.10/mfhdf/libsrc/array.c.s390 hdf-4.2.10/mfhdf/libsrc/array.c
|
||||
--- hdf-4.2.10/mfhdf/libsrc/array.c.s390 2014-02-14 09:20:50.693141452 -0700
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/array.c 2014-02-14 09:26:40.897231851 -0700
|
||||
@@ -620,7 +620,7 @@ xdr_NC_array(xdrs, app)
|
||||
xdr_NC_fnct = xdr_shorts ;
|
||||
goto func ;
|
||||
case NC_LONG :
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
xdr_NC_fnct = xdr_int ;
|
||||
#else
|
||||
xdr_NC_fnct = xdr_long ;
|
||||
diff -up hdf-4.2.10/mfhdf/libsrc/cdf.c.s390 hdf-4.2.10/mfhdf/libsrc/cdf.c
|
||||
--- hdf-4.2.10/mfhdf/libsrc/cdf.c.s390 2014-02-14 09:20:50.694141447 -0700
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/cdf.c 2014-02-14 09:27:33.826948531 -0700
|
||||
@@ -3662,7 +3662,7 @@ NC_var *vp ;
|
||||
break ;
|
||||
case NC_LONG :
|
||||
alen /= 4 ;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
xdr_NC_fnct = xdr_int ;
|
||||
#else
|
||||
xdr_NC_fnct = xdr_long ;
|
||||
diff -up hdf-4.2.10/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.10/mfhdf/libsrc/netcdf.h.in
|
||||
--- hdf-4.2.10/mfhdf/libsrc/netcdf.h.in.s390 2014-02-14 09:20:51.260138101 -0700
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/netcdf.h.in 2014-02-14 09:27:06.286095942 -0700
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/array.c.s390 hdf-4.2.15/mfhdf/libsrc/array.c
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.s390 hdf-4.2.15/mfhdf/libsrc/cdf.c
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in
|
||||
--- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 2020-04-30 21:07:16.957922998 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:15:23.731467288 -0600
|
||||
@@ -293,7 +293,7 @@ typedef double ncdouble;
|
||||
/*
|
||||
/*
|
||||
* Variables/attributes of type NC_LONG should use the C type 'nclong'
|
||||
*/
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
@ -232,31 +210,22 @@ diff -up hdf-4.2.10/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.10/mfhdf/libsrc/netcdf
|
||||
/*
|
||||
* LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
|
||||
* http://www.unix.org/version2/whatsnew/lp64_wp.html
|
||||
diff -up hdf-4.2.10/mfhdf/libsrc/putget.c.s390 hdf-4.2.10/mfhdf/libsrc/putget.c
|
||||
--- hdf-4.2.10/mfhdf/libsrc/putget.c.s390 2014-02-14 09:20:51.261138095 -0700
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/putget.c 2014-02-14 09:24:03.676074745 -0700
|
||||
@@ -664,7 +664,7 @@ Void *values ;
|
||||
case NC_SHORT :
|
||||
return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
|
||||
case NC_LONG :
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return( xdr_int(xdrs, (nclong *)values) ) ;
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.s390 hdf-4.2.15/mfhdf/libsrc/putget.c
|
||||
--- hdf-4.2.15/mfhdf/libsrc/putget.c.s390 2020-04-30 21:07:16.959923025 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:12:13.612268179 -0600
|
||||
@@ -665,7 +665,7 @@ Void *values ;
|
||||
case NC_SHORT :
|
||||
return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
|
||||
case NC_LONG :
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return( xdr_int(xdrs, (nclong *)values) ) ;
|
||||
#else
|
||||
return( xdr_long(xdrs, (nclong *)values) ) ;
|
||||
@@ -1975,7 +1975,7 @@ Void *values ;
|
||||
} /* else */
|
||||
return(TRUE) ;
|
||||
case NC_LONG :
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
xdr_NC_fnct = xdr_int ;
|
||||
#else
|
||||
xdr_NC_fnct = xdr_long ;
|
||||
diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposix.c
|
||||
--- hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 2014-02-09 19:28:45.000000000 -0700
|
||||
+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c 2014-02-14 09:26:17.898354986 -0700
|
||||
@@ -250,7 +250,7 @@ int nbytes;
|
||||
return( xdr_long(xdrs, (nclong *)values) ) ;
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.15/mfhdf/libsrc/xdrposix.c
|
||||
--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 2020-03-03 10:40:50.000000000 -0700
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:14:47.574557550 -0600
|
||||
@@ -262,7 +262,7 @@ int nbytes;
|
||||
|
||||
static bool_t xdrposix_getlong();
|
||||
static bool_t xdrposix_putlong();
|
||||
@ -265,7 +234,7 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi
|
||||
static bool_t xdrposix_getint();
|
||||
static bool_t xdrposix_putint();
|
||||
#endif
|
||||
@@ -264,7 +264,7 @@ static long * xdrposix_inline();
|
||||
@@ -276,7 +276,7 @@ static long * xdrposix_inline();
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t * xdrposix_inline();
|
||||
#else
|
||||
@ -273,8 +242,8 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi
|
||||
+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
||||
static int32_t * xdrposix_inline();
|
||||
#else
|
||||
#if (defined __alpha )
|
||||
@@ -294,9 +294,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||
static netlong * xdrposix_inline();
|
||||
@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||
xdrposix_getpos, /* get offset in the stream */
|
||||
xdrposix_setpos, /* set offset in the stream */
|
||||
xdrposix_inline, /* prime stream for inline macros */
|
||||
@ -282,20 +251,20 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi
|
||||
+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
xdrposix_destroy, /* destroy stream */
|
||||
-#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
+#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
NULL, /* no xdr_control function defined */
|
||||
#endif
|
||||
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
||||
@@ -431,7 +431,7 @@ xdrposix_getlong(xdrs, lp)
|
||||
#endif
|
||||
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
||||
@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp)
|
||||
long *lp;
|
||||
{
|
||||
unsigned char *up = (unsigned char *)lp ;
|
||||
-#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
|
||||
+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
-#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
|
||||
+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
*lp = 0 ;
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
@@ -458,7 +458,7 @@ xdrposix_putlong(xdrs, lp)
|
||||
@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp)
|
||||
netlong mycopy = htonl(*lp);
|
||||
up = (unsigned char *)&mycopy;
|
||||
#endif
|
||||
@ -304,16 +273,16 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
|
||||
@@ -552,7 +552,7 @@ static rpc_inline_t *
|
||||
#if (defined __alpha)
|
||||
static int*
|
||||
@@ -560,7 +560,7 @@ static long *
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t *
|
||||
#else
|
||||
-#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__
|
||||
+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
||||
static int32_t *
|
||||
static int32_t *
|
||||
#else
|
||||
static netlong *
|
||||
@@ -580,7 +580,7 @@ int
|
||||
static netlong *
|
||||
@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
@ -322,27 +291,27 @@ diff -up hdf-4.2.10/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.10/mfhdf/libsrc/xdrposi
|
||||
|
||||
static bool_t
|
||||
xdrposix_getint(xdrs, lp)
|
||||
diff -up hdf-4.2.10/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.10/mfhdf/ncgen/ncgen.l
|
||||
--- hdf-4.2.10/mfhdf/ncgen/ncgen.l.s390 2014-02-14 09:20:51.262138089 -0700
|
||||
+++ hdf-4.2.10/mfhdf/ncgen/ncgen.l 2014-02-14 09:27:53.015845830 -0700
|
||||
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss
|
||||
yyerror(errstr);
|
||||
}
|
||||
diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.15/mfhdf/ncgen/ncgen.l
|
||||
--- hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 2020-04-30 21:07:16.961923053 -0600
|
||||
+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:08:10.175628593 -0600
|
||||
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
diff -up hdf-4.2.10/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
|
||||
--- hdf-4.2.10/mfhdf/ncgen/ncgenyy.c.s390 2014-05-22 08:33:21.700132543 -0400
|
||||
+++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c 2014-05-22 08:33:50.990132543 -0400
|
||||
@@ -989,7 +989,7 @@ YY_RULE_SETUP
|
||||
yyerror(errstr);
|
||||
}
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c
|
||||
--- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 2020-04-30 21:07:16.963923081 -0600
|
||||
+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:08:53.818030313 -0600
|
||||
@@ -991,7 +991,7 @@ YY_RULE_SETUP
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
if (dd < LONG_MIN || dd > LONG_MAX)
|
||||
|
102
hdf.spec
102
hdf.spec
@ -1,10 +1,13 @@
|
||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||
# No more Java on i686
|
||||
%ifarch %{java_arches}
|
||||
%bcond_without java
|
||||
%else
|
||||
%bcond_with java
|
||||
%endif
|
||||
|
||||
Name: hdf
|
||||
Version: 4.2.14
|
||||
Release: 9%{?dist}
|
||||
Version: 4.2.15
|
||||
Release: 11.0.riscv64%{?dist}
|
||||
Summary: A general purpose library and file format for storing scientific data
|
||||
License: BSD
|
||||
URL: https://portal.hdfgroup.org/
|
||||
@ -20,17 +23,13 @@ Patch5: hdf-destdir.patch
|
||||
# Install examples into the right location
|
||||
Patch6: hdf-examplesdir.patch
|
||||
# Add AArch64 definitions
|
||||
Patch8: hdf-4.2.10-aarch64.patch
|
||||
Patch8: hdf-aarch64.patch
|
||||
# ppc64le support
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1134385
|
||||
Patch9: hdf-ppc64le.patch
|
||||
|
||||
# Fix syntax error on epel6 builds
|
||||
# Use only if java is disabled
|
||||
Patch10: hdf-avoid_syntax_error_el6.patch
|
||||
|
||||
# Fix java build
|
||||
Patch11: hdf-build.patch
|
||||
Patch20: hdf-4.2.15-riscv64.patch
|
||||
|
||||
# For destdir/examplesdir patches
|
||||
BuildRequires: automake, libtool, gcc, gcc-c++
|
||||
@ -38,11 +37,16 @@ BuildRequires: chrpath
|
||||
BuildRequires: flex byacc libjpeg-devel zlib-devel %{!?el6:libaec-devel}
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: gcc-gfortran, gcc
|
||||
%if %{with java}
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: javapackages-tools
|
||||
%else
|
||||
Obsoletes: java-hdf < %{version}-%{release}
|
||||
%endif
|
||||
BuildRequires: hamcrest
|
||||
BuildRequires: junit
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: make
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
@ -83,6 +87,7 @@ Requires: %{name}-devel = %{version}-%{release}
|
||||
HDF4 static libraries.
|
||||
|
||||
|
||||
%if %{with java}
|
||||
%package -n java-hdf
|
||||
Summary: HDF4 java library
|
||||
Requires: slf4j
|
||||
@ -90,12 +95,13 @@ Obsoletes: jhdf < 3.3.1-2
|
||||
|
||||
%description -n java-hdf
|
||||
HDF4 java library
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1 -b .maxavailfiles
|
||||
#patch0 -p1 -b .maxavailfiles
|
||||
%patch1 -p1 -b .ppc
|
||||
%patch2 -p1 -b .sparc
|
||||
%patch3 -p1 -b .s390
|
||||
@ -105,23 +111,26 @@ HDF4 java library
|
||||
%patch8 -p1 -b .aarch64
|
||||
%patch9 -p1 -b .ppc64le
|
||||
%patch11 -p1 -b .build
|
||||
%patch20 -p1 -b .riscv64
|
||||
|
||||
%if %{with java}
|
||||
# Replace jars with system versions
|
||||
find -name \*.jar -delete
|
||||
# hamcrest-core is obsoleted in hamcrest-2.2
|
||||
# Junit tests are failing with junit-4.13.1
|
||||
%if 0%{?rhel} >= 9 || 0%{?fedora}
|
||||
find . ! -name junit.jar -name "*.jar" -delete
|
||||
ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar
|
||||
%else
|
||||
find . -name "*.jar" -delete
|
||||
ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar
|
||||
ln -s %{_javadir}/junit.jar java/lib/junit.jar
|
||||
ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.5.jar
|
||||
ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.5.jar
|
||||
ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.5.jar
|
||||
|
||||
# Fix test output
|
||||
junit_ver=$(sed -n '/<version>/{s/^.*>\([0-9]\.[0-9]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom)
|
||||
junit_ver=$(sed -n '/<version>/{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom)
|
||||
sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt
|
||||
|
||||
## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
|
||||
# Use only if java is disabled
|
||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||
%patch10 -p0
|
||||
%endif
|
||||
ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar
|
||||
ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar
|
||||
ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar
|
||||
%endif
|
||||
|
||||
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
|
||||
@ -148,7 +157,7 @@ export LIBS="-ltirpc"
|
||||
mkdir -p build-shared/java/lib
|
||||
cd build-shared
|
||||
# Java requires shared libraries, fortran requires static
|
||||
%configure --disable-production --enable-java --disable-netcdf \
|
||||
%configure --disable-production %{?with_java:--enable-java} --disable-netcdf \
|
||||
--enable-shared=yes --enable-static=no --disable-fortran %{!?el6:--with-szlib} \
|
||||
--includedir=%{_includedir}/%{name}
|
||||
%make_build
|
||||
@ -158,7 +167,7 @@ cd build-static
|
||||
# Java requires shared libraries, fortran requires static
|
||||
|
||||
# Temporary workaround for compiling on GCC-10
|
||||
%if 0%{?fedora} && 0%{?fedora} > 31
|
||||
%if 0%{?fedora} || 0%{?rhel} > 8
|
||||
export FCFLAGS="%{build_fflags} -fallow-argument-mismatch"
|
||||
export FFLAGS="%{build_fflags} -fallow-argument-mismatch"
|
||||
%endif
|
||||
@ -178,7 +187,7 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90
|
||||
%install
|
||||
%make_install -C build-static
|
||||
%make_install -C build-shared
|
||||
chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* || :
|
||||
chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || :
|
||||
|
||||
install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/
|
||||
|
||||
@ -254,12 +263,55 @@ make -j1 -C build-static check
|
||||
%files static
|
||||
%{_libdir}/*.a
|
||||
|
||||
%if %{with java}
|
||||
%files -n java-hdf
|
||||
%{_jnidir}/hdf.jar
|
||||
%{_libdir}/%{name}/libhdf_java.so
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 26 2022 David Abdurachmanov <davidlt@rivosinc.com> - 4.2.15-11.0.riscv64
|
||||
- Add support for riscv64 (based on aarch64)
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sun Jul 10 2022 Orion Poplawski <orion@nwra.com> - 4.2.15-10
|
||||
- Drop java for i686 (bz#2104047)
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2.15-9
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 29 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.2.15-7
|
||||
- Fix eln builds
|
||||
|
||||
* Wed Jul 28 2021 Antonio Trande <sagitter@fedoraproject.org> - 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 <orion@nwra.com> - 4.2.15-5
|
||||
- Handle junit versions better
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 21 2020 Merlin Mathesius <mmathesi@redhat.com> - 4.2.15-2
|
||||
- Minor conditional fix for ELN
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.2.15-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Fri May 01 2020 Orion Poplawski <orion@nwra.com> - 4.2.15-1
|
||||
- Update to 4.2.15
|
||||
|
||||
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 4.2.14-9
|
||||
- Fix string quoting for rpm >= 4.16
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (hdf-4.2.14.tar.bz2) = 5689525e18bfc6be205a0a21cded68d66630020c9a1445ce5afae41d58246e26ed9ba349da1bb197c31557aba127f51a2b697a868ec7e2747ac6153858171718
|
||||
SHA512 (hdf-4.2.15.tar.bz2) = 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
|
||||
|
Loading…
Reference in New Issue
Block a user