Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2e5d70219d | ||
|
0d8def3f73 | ||
|
0ab2802980 | ||
|
0f230347f9 | ||
|
99b8c2472b |
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,4 +7,3 @@ hdf-4.2.5.tar.bz2
|
||||
/hdf-4.2.11.tar.bz2
|
||||
/hdf-4.2.12.tar.bz2
|
||||
/hdf-4.2.13.tar.bz2
|
||||
/hdf-4.2.14.tar.bz2
|
||||
|
||||
6
h4comp
6
h4comp
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
BITS=32
|
||||
[ -d /usr/lib64 ] && BITS=64
|
||||
|
||||
exec $0-${BITS} "$@"
|
||||
1161
hdf-4.2.4-ppc.patch
Normal file
1161
hdf-4.2.4-ppc.patch
Normal file
File diff suppressed because it is too large
Load Diff
348
hdf-4.2.4-s390.patch
Normal file
348
hdf-4.2.4-s390.patch
Normal file
@ -0,0 +1,348 @@
|
||||
diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 hdf-4.2.4-snap8/hdf/src/hdfi.h
|
||||
--- hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 2010-02-01 13:28:25.387386871 -0700
|
||||
+++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:31:46.343387138 -0700
|
||||
@@ -78,6 +78,7 @@
|
||||
#define DFMT_POWERPC64 0x1111
|
||||
#define DFMT_LINUXPPC 0x1111
|
||||
#define DFMT_LINUXSPARC 0x1111
|
||||
+#define DFMT_LINUX390 0x1111
|
||||
|
||||
/* I/O library constants */
|
||||
#define UNIXUNBUFIO 1
|
||||
@@ -1453,6 +1454,66 @@ typedef int hdf_pint_t;
|
||||
|
||||
#endif /* Linux Sparc32/64 */
|
||||
|
||||
+/* Linux s390/s390x */
|
||||
+#if defined __s390__ || defined __s390x__
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE
|
||||
+
|
||||
+#include <sys/file.h> /* for unbuffered i/o stuff */
|
||||
+#include <sys/stat.h>
|
||||
+#define DF_MT DFMT_LINUX390
|
||||
+typedef void VOID;
|
||||
+typedef void *VOIDP;
|
||||
+typedef char *_fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+#ifdef __s390x__ /* 64-bit environment */
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+#else /* 32-bit environment */
|
||||
+typedef long int int32;
|
||||
+typedef unsigned long int uint32;
|
||||
+#endif
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef int intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+#ifdef __s390x__ /* 64-bit environment */
|
||||
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#else /* 32-bit environment */
|
||||
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#endif
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+
|
||||
+#ifdef __GNUC__
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+#endif
|
||||
+
|
||||
+#endif /* Linux s390/s390x */
|
||||
+
|
||||
/*-----------------------------------------------------*/
|
||||
/* 64-bit Free BSD */
|
||||
|
||||
diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c
|
||||
--- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 2010-02-01 13:28:25.373389124 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c 2010-02-01 13:28:25.419387130 -0700
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
|
||||
|
||||
struct ncfils { /* This will be a common block from Fortran */
|
||||
double dd;
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
int ll;
|
||||
#else
|
||||
long ll;
|
||||
@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
|
||||
}
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
/*
|
||||
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
||||
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
||||
@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs = *(int *)value;
|
||||
@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, ncount, ndims);
|
||||
@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itolg (value, ncount, nbasis, ndims);
|
||||
@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long longs;
|
||||
@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
tmpbasis = nctypelen(NC_LONG);
|
||||
else
|
||||
#endif
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
if (datatype == NC_LONG)
|
||||
tmpbasis = sizeof(int);
|
||||
else
|
||||
@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
||||
@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype,
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
long *longs = itol (value, attlen, 1);
|
||||
@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco
|
||||
return;
|
||||
} /* else */
|
||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
#ifdef HDF
|
||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
||||
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/array.c
|
||||
--- hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 2010-01-17 21:24:53.000000000 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/libsrc/array.c 2010-02-01 13:28:25.422387595 -0700
|
||||
@@ -622,7 +622,7 @@ xdr_NC_array(xdrs, app)
|
||||
case NC_LONG :
|
||||
#if defined _CRAYMPP
|
||||
xdr_NC_fnct = xdr_short;
|
||||
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#elif 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.4-snap8/mfhdf/libsrc/cdf.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c
|
||||
--- hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 2010-01-17 21:24:53.000000000 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c 2010-02-01 13:28:25.424387272 -0700
|
||||
@@ -3657,7 +3657,7 @@ NC_var *vp ;
|
||||
alen /= 4 ;
|
||||
#if defined _CRAYMPP
|
||||
xdr_NC_fnct = xdr_short;
|
||||
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#elif 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.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h
|
||||
--- hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 2010-02-01 13:28:25.380387278 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h 2010-02-01 13:28:25.418387640 -0700
|
||||
@@ -304,7 +304,7 @@ typedef double ncdouble;
|
||||
*/
|
||||
#if defined _CRAYMPP
|
||||
typedef short nclong;
|
||||
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
|
||||
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
typedef int nclong;
|
||||
#else
|
||||
typedef long nclong; /* default, compatible type */
|
||||
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in
|
||||
--- hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 2010-02-01 13:28:25.380387278 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in 2010-02-01 13:28:25.417387775 -0700
|
||||
@@ -295,7 +295,7 @@ typedef double ncdouble;
|
||||
*/
|
||||
#if defined _CRAYMPP
|
||||
typedef short nclong;
|
||||
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
|
||||
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__ || defined __s390x__
|
||||
typedef int nclong;
|
||||
#else
|
||||
typedef long nclong; /* default, compatible type */
|
||||
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/putget.c
|
||||
--- hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 2010-01-17 21:24:53.000000000 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/libsrc/putget.c 2010-02-01 13:28:25.421386028 -0700
|
||||
@@ -652,7 +652,7 @@ Void *values ;
|
||||
case NC_LONG :
|
||||
#if defined _CRAYMPP
|
||||
return( xdr_short(xdrs, (nclong *)values) ) ;
|
||||
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
return( xdr_int(xdrs, (nclong *)values) ) ;
|
||||
#else
|
||||
return( xdr_long(xdrs, (nclong *)values) ) ;
|
||||
@@ -1966,7 +1966,7 @@ Void *values ;
|
||||
case NC_LONG :
|
||||
#if defined _CRAYMPP
|
||||
xdr_NC_fnct = xdr_short;
|
||||
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#elif 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.4-snap8/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c
|
||||
--- hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c.s390 2010-01-17 21:24:53.000000000 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c 2010-02-01 13:28:25.425387348 -0700
|
||||
@@ -283,7 +283,7 @@ int nbytes;
|
||||
|
||||
static bool_t xdrposix_getlong();
|
||||
static bool_t xdrposix_putlong();
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
static bool_t xdrposix_getint();
|
||||
static bool_t xdrposix_putint();
|
||||
#endif
|
||||
@@ -300,7 +300,7 @@ static long * xdrposix_inline();
|
||||
#if (defined __sun && defined _LP64)
|
||||
static rpc_inline_t * xdrposix_inline();
|
||||
#else
|
||||
-#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__
|
||||
+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
||||
static int32_t * xdrposix_inline();
|
||||
#else
|
||||
#if (defined __alpha )
|
||||
@@ -331,9 +331,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||
xdrposix_getpos, /* get offset in the stream */
|
||||
xdrposix_setpos, /* set offset in the stream */
|
||||
xdrposix_inline, /* prime stream for inline macros */
|
||||
-#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
|
||||
+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
xdrposix_destroy, /* destroy stream */
|
||||
-#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
+#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
||||
NULL, /* no xdr_control function defined */
|
||||
#endif
|
||||
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
||||
@@ -468,7 +468,7 @@ xdrposix_getlong(xdrs, lp)
|
||||
#endif
|
||||
{
|
||||
unsigned char *up = (unsigned char *)lp ;
|
||||
-#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
|
||||
+#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
*lp = 0 ;
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
@@ -495,7 +495,7 @@ xdrposix_putlong(xdrs, lp)
|
||||
netlong mycopy = htonl(*lp);
|
||||
up = (unsigned char *)&mycopy;
|
||||
#endif
|
||||
-#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
|
||||
+#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
|
||||
@@ -592,7 +592,7 @@ static rpc_inline_t *
|
||||
#if (defined __alpha)
|
||||
static int*
|
||||
#else
|
||||
-#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__
|
||||
+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
||||
static int32_t *
|
||||
#else
|
||||
static netlong *
|
||||
@@ -621,7 +621,7 @@ int
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
|
||||
static bool_t
|
||||
xdrposix_getint(xdrs, lp)
|
||||
diff -up hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l
|
||||
--- hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.s390 2010-02-01 13:28:25.381387100 -0700
|
||||
+++ hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l 2010-02-01 13:28:25.420387234 -0700
|
||||
@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss
|
||||
yyerror(errstr);
|
||||
}
|
||||
|
||||
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
||||
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
||||
if (dd < INT_MIN || dd > INT_MAX)
|
||||
#else
|
||||
#if defined (_CRAYMPP)
|
||||
@ -1,67 +0,0 @@
|
||||
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
|
||||
@@ -12,8 +12,8 @@ classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
pkgpath = examples
|
||||
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
-jarfile = jar$(PACKAGE_TARNAME)examples.jar
|
||||
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
||||
+jarfile = $(PACKAGE_TARNAME)examples.jar
|
||||
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.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)
|
||||
|
||||
# This is our main target
|
||||
-lib_LTLIBRARIES=libhdf_java.la
|
||||
+pkglib_LTLIBRARIES=libhdf_java.la
|
||||
+
|
||||
+# No soname for JNI library
|
||||
+libhdf_java_la_LDFLAGS = -avoid-version
|
||||
|
||||
# Source files for the library
|
||||
libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
|
||||
diff -up 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
|
||||
@@ -13,8 +13,8 @@ JAVAROOT = .classes
|
||||
classes:
|
||||
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
||||
|
||||
-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
-hdf_javadir = $(libdir)
|
||||
+jarfile = $(PACKAGE_TARNAME).jar
|
||||
+hdf_javadir = $(prefix)/lib/java
|
||||
|
||||
pkgpath = hdf/hdflib
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.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
|
||||
@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
||||
BLDLIBDIR="$top_builddir/java/lib"
|
||||
BLDDIR="."
|
||||
HDFTEST_HOME="$top_srcdir/java/test"
|
||||
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
+JARFILE=@PACKAGE_TARNAME@.jar
|
||||
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
diff -up 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
|
||||
@@ -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
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)test.jar
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up a/hdf/examples/Makefile.am b/hdf/examples/Makefile.am
|
||||
--- a/hdf/examples/Makefile.am 2017-01-31 14:41:51.947802481 -0700
|
||||
+++ b/hdf/examples/Makefile.am 2017-01-31 14:42:34.883572782 -0700
|
||||
diff -up hdf/examples/Makefile.am hdf-4.2.12/hdf/examples/Makefile.am
|
||||
--- hdf/examples/Makefile.am 2017-01-31 14:41:51.947802481 -0700
|
||||
+++ hdf/examples/Makefile.am 2017-01-31 14:42:34.883572782 -0700
|
||||
@@ -46,8 +46,8 @@
|
||||
INSTALL_TOP_FILES = README
|
||||
|
||||
@ -12,9 +12,9 @@ diff -up a/hdf/examples/Makefile.am b/hdf/examples/Makefile.am
|
||||
|
||||
# How to build C programs using h4cc
|
||||
$(EXTRA_PROG): $(H4CC)
|
||||
diff -up a/hdf/fortran/examples/Makefile.am b/hdf/fortran/examples/Makefile.am
|
||||
--- a/hdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.949802471 -0700
|
||||
+++ b/hdf/fortran/examples/Makefile.am 2017-01-31 14:43:07.968395906 -0700
|
||||
diff -up hdf/fortran/examples/Makefile.am hdf/fortran/examples/Makefile.am
|
||||
--- hdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.949802471 -0700
|
||||
+++ hdf/fortran/examples/Makefile.am 2017-01-31 14:43:07.968395906 -0700
|
||||
@@ -41,7 +41,7 @@
|
||||
INSTALL_SCRIPT_FILES = run-fortran-ex.sh
|
||||
|
||||
@ -24,9 +24,9 @@ diff -up a/hdf/fortran/examples/Makefile.am b/hdf/fortran/examples/Makefile.am
|
||||
|
||||
# How to build Fortran programs using h4fc
|
||||
$(EXTRA_PROG): $(H4FC)
|
||||
diff -up a/mfhdf/examples/Makefile.am b/mfhdf/examples/Makefile.am
|
||||
--- a/mfhdf/examples/Makefile.am 2017-01-31 14:41:51.950802465 -0700
|
||||
+++ b/mfhdf/examples/Makefile.am 2017-01-31 14:43:23.376314066 -0700
|
||||
diff -up mfhdf/examples/Makefile.am mfhdf/examples/Makefile.am
|
||||
--- mfhdf/examples/Makefile.am 2017-01-31 14:41:51.950802465 -0700
|
||||
+++ mfhdf/examples/Makefile.am 2017-01-31 14:43:23.376314066 -0700
|
||||
@@ -23,7 +23,7 @@
|
||||
SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \
|
||||
SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
|
||||
@ -36,9 +36,9 @@ diff -up a/mfhdf/examples/Makefile.am b/mfhdf/examples/Makefile.am
|
||||
|
||||
# How to build programs using h4cc
|
||||
$(EXTRA_PROG): $(H4CC)
|
||||
diff -up a/mfhdf/fortran/examples/Makefile.am b/mfhdf/fortran/examples/Makefile.am
|
||||
--- a/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.952802455 -0700
|
||||
+++ b/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:43:40.206224672 -0700
|
||||
diff -up mfhdf/fortran/examples/Makefile.am mfhdf/fortran/examples/Makefile.am
|
||||
--- mfhdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.952802455 -0700
|
||||
+++ mfhdf/fortran/examples/Makefile.am 2017-01-31 14:43:40.206224672 -0700
|
||||
@@ -24,7 +24,7 @@
|
||||
SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
|
||||
|
||||
|
||||
258
hdf.spec
258
hdf.spec
@ -1,15 +1,11 @@
|
||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||
%endif
|
||||
|
||||
Name: hdf
|
||||
Version: 4.2.14
|
||||
Release: 9%{?dist}
|
||||
Version: 4.2.13
|
||||
Release: 1%{?dist}
|
||||
Summary: A general purpose library and file format for storing scientific data
|
||||
License: BSD
|
||||
URL: https://portal.hdfgroup.org/
|
||||
Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2
|
||||
Source1: h4comp
|
||||
Group: System Environment/Libraries
|
||||
URL: http://hdfgroup.org/products/hdf4/index.html
|
||||
Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/%{name}-%{version}.tar.bz2
|
||||
Patch0: hdf-4.2.5-maxavailfiles.patch
|
||||
Patch1: hdf-ppc.patch
|
||||
Patch2: hdf-4.2.4-sparc.patch
|
||||
@ -29,145 +25,72 @@ Patch9: hdf-ppc64le.patch
|
||||
# Use only if java is disabled
|
||||
Patch10: hdf-avoid_syntax_error_el6.patch
|
||||
|
||||
# Fix java build
|
||||
Patch11: hdf-build.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
# For destdir/examplesdir patches
|
||||
BuildRequires: automake, libtool, gcc, gcc-c++
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: flex byacc libjpeg-devel zlib-devel %{!?el6:libaec-devel}
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: gcc-gfortran, gcc
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: hamcrest
|
||||
BuildRequires: junit
|
||||
BuildRequires: slf4j
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: flex byacc libjpeg-devel zlib-devel
|
||||
%if "%{?dist}" != ".el4"
|
||||
BuildRequires: gcc-gfortran
|
||||
%else
|
||||
BuildRequires: gcc-g77
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
HDF4 is a general purpose library and file format for storing scientific data.
|
||||
HDF4 can store two primary objects: datasets and groups. A dataset is
|
||||
HDF is a general purpose library and file format for storing scientific data.
|
||||
HDF can store two primary objects: datasets and groups. A dataset is
|
||||
essentially a multidimensional array of data elements, and a group is a
|
||||
structure for organizing objects in an HDF4 file. Using these two basic
|
||||
structure for organizing objects in an HDF file. Using these two basic
|
||||
objects, one can create and store almost any kind of scientific data
|
||||
structure, such as images, arrays of vectors, and structured and unstructured
|
||||
grids. You can also mix and match them in HDF4 files according to your needs.
|
||||
grids. You can also mix and match them in HDF files according to your needs.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: HDF4 development files
|
||||
Summary: HDF development files
|
||||
Group: Development/Libraries
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: libjpeg-devel%{?_isa}
|
||||
Requires: libtirpc-devel%{?_isa}
|
||||
Requires: zlib-devel%{?_isa}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: libjpeg-devel zlib-devel
|
||||
|
||||
%description devel
|
||||
HDF4 development headers and libraries.
|
||||
|
||||
|
||||
%package libs
|
||||
Summary: HDF4 shared libraries
|
||||
|
||||
%description libs
|
||||
HDF4 shared libraries.
|
||||
|
||||
|
||||
%package static
|
||||
Summary: HDF4 static libraries
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
|
||||
%description static
|
||||
HDF4 static libraries.
|
||||
|
||||
|
||||
%package -n java-hdf
|
||||
Summary: HDF4 java library
|
||||
Requires: slf4j
|
||||
Obsoletes: jhdf < 3.3.1-2
|
||||
|
||||
%description -n java-hdf
|
||||
HDF4 java library
|
||||
HDF development headers and libraries.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1 -b .maxavailfiles
|
||||
%patch1 -p1 -b .ppc
|
||||
%patch2 -p1 -b .sparc
|
||||
%patch3 -p1 -b .s390
|
||||
%patch4 -p1 -b .arm
|
||||
%patch5 -p1 -b .destdir
|
||||
%patch6 -p1 -b .examplesdir
|
||||
%patch6 -p0 -b .examplesdir
|
||||
%patch8 -p1 -b .aarch64
|
||||
%patch9 -p1 -b .ppc64le
|
||||
%patch11 -p1 -b .build
|
||||
|
||||
# Replace jars with system versions
|
||||
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)
|
||||
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
|
||||
%if 0%{?rhel} < 7
|
||||
%patch10 -p0
|
||||
%endif
|
||||
|
||||
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
|
||||
find . -type f -name "*.c" -exec chmod 0644 '{}' \;
|
||||
|
||||
chmod a-x *hdf/*/*.c hdf/*/*.h
|
||||
# restore include file timestamps modified by patching
|
||||
touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h
|
||||
|
||||
|
||||
%build
|
||||
|
||||
# For destdir/examplesdir patches
|
||||
autoreconf -vif
|
||||
|
||||
# avoid upstream compiler flags settings
|
||||
rm config/*linux-gnu
|
||||
|
||||
# TODO: upstream fix
|
||||
# libmfhdf.so is link to libdf.so
|
||||
export CFLAGS="%{optflags} -I%{_includedir}/tirpc"
|
||||
export LIBS="-ltirpc"
|
||||
%global _configure ../configure
|
||||
# Java test needs this but doesn't create it
|
||||
mkdir -p build-shared/java/lib
|
||||
cd build-shared
|
||||
# Java requires shared libraries, fortran requires static
|
||||
%configure --disable-production --enable-java --disable-netcdf \
|
||||
--enable-shared=yes --enable-static=no --disable-fortran %{!?el6:--with-szlib} \
|
||||
--includedir=%{_includedir}/%{name}
|
||||
%make_build
|
||||
cd -
|
||||
mkdir build-static
|
||||
cd build-static
|
||||
# Java requires shared libraries, fortran requires static
|
||||
|
||||
# Temporary workaround for compiling on GCC-10
|
||||
%if 0%{?fedora} && 0%{?fedora} > 31
|
||||
export FCFLAGS="%{build_fflags} -fallow-argument-mismatch"
|
||||
export FFLAGS="%{build_fflags} -fallow-argument-mismatch"
|
||||
%endif
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
|
||||
export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
|
||||
%configure --disable-production --disable-java --disable-netcdf \
|
||||
--enable-shared=no --enable-static=yes --enable-fortran %{!?el6:--with-szlib} \
|
||||
--includedir=%{_includedir}/%{name}
|
||||
%make_build
|
||||
cd -
|
||||
--includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}
|
||||
|
||||
make
|
||||
# correct the timestamps based on files used to generate the header files
|
||||
touch -c -r hdf/src/hdf.inc hdf/src/hdf.f90
|
||||
touch -c -r hdf/src/dffunc.inc hdf/src/dffunc.f90
|
||||
@ -176,15 +99,8 @@ 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.* || :
|
||||
|
||||
install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/%{name}/*.la
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
make install DESTDIR=%{buildroot} INSTALL='install -p'
|
||||
rm %{buildroot}%{_libdir}/%{name}/*.la
|
||||
#Don't conflict with netcdf
|
||||
for file in ncdump ncgen; do
|
||||
mv %{buildroot}%{_bindir}/$file %{buildroot}%{_bindir}/h$file
|
||||
@ -193,133 +109,35 @@ for file in ncdump ncgen; do
|
||||
done
|
||||
|
||||
# this is done to have the same timestamp on multiarch setups
|
||||
touch -c -r README.txt %{buildroot}%{_includedir}/hdf/h4config.h
|
||||
touch -c -r README.txt %{buildroot}/%{_includedir}/hdf/h4config.h
|
||||
|
||||
# Remove an autoconf conditional from the API that is unused and cause
|
||||
# the API to be different on x86 and x86_64
|
||||
pushd %{buildroot}%{_includedir}/hdf
|
||||
pushd %{buildroot}/%{_includedir}/hdf
|
||||
grep -v 'H4_SIZEOF_INTP' h4config.h > h4config.h.tmp
|
||||
touch -c -r h4config.h h4config.h.tmp
|
||||
mv h4config.h.tmp h4config.h
|
||||
popd
|
||||
|
||||
#Fixup headers and scripts for multiarch
|
||||
%if "%{_lib}" == "lib64"
|
||||
#sed -i -e s/H5pubconf.h/H5pubconf-64.h/ %{buildroot}%{_includedir}/H5public.h
|
||||
#mv %{buildroot}%{_includedir}/H5pubconf.h \
|
||||
#%{buildroot}%{_includedir}/H5pubconf-64.h
|
||||
for x in h4cc h4fc
|
||||
do
|
||||
mv %{buildroot}%{_bindir}/${x} \
|
||||
%{buildroot}%{_bindir}/${x}-64
|
||||
install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x}
|
||||
done
|
||||
%else
|
||||
#sed -i -e s/H5pubconf.h/H5pubconf-32.h/ %{buildroot}%{_includedir}/H5public.h
|
||||
#mv %{buildroot}%{_includedir}/H5pubconf.h \
|
||||
#%{buildroot}%{_includedir}/H5pubconf-32.h
|
||||
for x in h4cc h4fc
|
||||
do
|
||||
mv %{buildroot}%{_bindir}/${x} \
|
||||
%{buildroot}%{_bindir}/${x}-32
|
||||
install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x}
|
||||
done
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
make -j1 -C build-shared check
|
||||
make -j1 -C build-static check
|
||||
make check
|
||||
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%{_pkgdocdir}/
|
||||
%exclude %{_pkgdocdir}/examples
|
||||
%doc MANIFEST README.txt release_notes/*.txt
|
||||
%exclude %{_defaultdocdir}/%{name}/examples
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/h4?c*
|
||||
%{_libdir}/*.so.0*
|
||||
%{_mandir}/man1/*.gz
|
||||
|
||||
%files devel
|
||||
%{_bindir}/h4?c*
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.settings
|
||||
%{_pkgdocdir}/examples/
|
||||
|
||||
%files libs
|
||||
%{_libdir}/*.so.0*
|
||||
|
||||
%files static
|
||||
%{_libdir}/*.a
|
||||
|
||||
%files -n java-hdf
|
||||
%{_jnidir}/hdf.jar
|
||||
%{_libdir}/%{name}/libhdf_java.so
|
||||
%{_libdir}/%{name}/
|
||||
%{_defaultdocdir}/%{name}/examples
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 4.2.14-9
|
||||
- Fix string quoting for rpm >= 4.16
|
||||
|
||||
* Sun Feb 02 2020 Antonio Trande <sagitter@fedoraproject.org> 4.2.14-8
|
||||
- Temporary workaround for compiling with GCC-10
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.14-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Nov 8 2019 Orion Poplawski <orion@nwra.com> - 4.2.14-6
|
||||
- Move compile scripts to hdf-devel and allow multilib install (bz#1769326)
|
||||
- Split shared libraries into hdf-libs sub-package
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.14-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Apr 10 2019 Orion Poplawski <orion@nwra.com> - 4.2.14-4
|
||||
- Move libraries into %%{_libdir}
|
||||
|
||||
* Tue Apr 9 2019 Orion Poplawski <orion@nwra.com> - 4.2.14-3
|
||||
- Build shared libraries
|
||||
- Enable java
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Nov 03 2018 Antonio Trande <sagitter@fedoraproject.org> 4.2.14-1
|
||||
- Release 4.2.14
|
||||
|
||||
* Sun Oct 7 2018 Orion Poplawski <orion@nwra.com> - 4.2.13-11
|
||||
- Use LIBS instead of LDFLAGS for -ltirpc
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 22 2018 Antonio Trande <sagitter@fedoraproject.org> - 4.2.13-9
|
||||
- Add gcc BR
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Feb 5 2018 Orion Poplawski <orion@nwra.com> - 4.2.13-7
|
||||
- Make hdf-devel require libtirpc-devel
|
||||
|
||||
* Fri Feb 02 2018 Orion Poplawski <orion@cora.nwra.com> - 4.2.13-6
|
||||
- Rebuild for gcc 8.0
|
||||
|
||||
* Sat Jan 20 2018 Antonio Trande <sagitter@fedoraproject.org> 4.2.13-5
|
||||
- Enable szlib support
|
||||
|
||||
* Wed Jan 17 2018 Pavel Raiskup <praiskup@redhat.com> - 4.2.13-4
|
||||
- rpc api moved from glibc to libtirpc:
|
||||
https://fedoraproject.org/wiki/Changes/SunRPCRemoval
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Jul 21 2017 Antonio Trande <sagitter@fedoraproject.org> 4.2.13-1
|
||||
- Update to 4.2.13
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (hdf-4.2.14.tar.bz2) = 5689525e18bfc6be205a0a21cded68d66630020c9a1445ce5afae41d58246e26ed9ba349da1bb197c31557aba127f51a2b697a868ec7e2747ac6153858171718
|
||||
SHA512 (hdf-4.2.13.tar.bz2) = d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
|
||||
|
||||
Loading…
Reference in New Issue
Block a user