Compare commits
3 Commits
master
...
EL-6-split
Author | SHA1 | Date | |
---|---|---|---|
|
23fbc78ffe | ||
|
3d69ae6e05 | ||
|
08cf84773a |
@ -1 +1 @@
|
|||||||
HDF4.2r4.tar.gz
|
hdf-4.2.5.tar.bz2
|
||||||
|
2
Makefile
2
Makefile
@ -4,7 +4,7 @@ NAME := hdf
|
|||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
SPECFILE = $(firstword $(wildcard *.spec))
|
||||||
|
|
||||||
define find-makefile-common
|
define find-makefile-common
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||||
endef
|
endef
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,6 @@
|
|||||||
--- HDF4.2r2/hdf/src/hdfi.h.orig 2008-02-04 17:27:04.000000000 +0100
|
diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 hdf-4.2.4-snap8/hdf/src/hdfi.h
|
||||||
+++ HDF4.2r2/hdf/src/hdfi.h 2008-02-04 17:29:54.000000000 +0100
|
--- 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 @@
|
@@ -78,6 +78,7 @@
|
||||||
#define DFMT_POWERPC64 0x1111
|
#define DFMT_POWERPC64 0x1111
|
||||||
#define DFMT_LINUXPPC 0x1111
|
#define DFMT_LINUXPPC 0x1111
|
||||||
@ -8,7 +9,7 @@
|
|||||||
|
|
||||||
/* I/O library constants */
|
/* I/O library constants */
|
||||||
#define UNIXUNBUFIO 1
|
#define UNIXUNBUFIO 1
|
||||||
@@ -1505,6 +1506,66 @@
|
@@ -1453,6 +1454,66 @@ typedef int hdf_pint_t;
|
||||||
|
|
||||||
#endif /* Linux Sparc32/64 */
|
#endif /* Linux Sparc32/64 */
|
||||||
|
|
||||||
@ -72,33 +73,12 @@
|
|||||||
+
|
+
|
||||||
+#endif /* Linux s390/s390x */
|
+#endif /* Linux s390/s390x */
|
||||||
+
|
+
|
||||||
/*#ifndef GOT_MACHINE
|
/*-----------------------------------------------------*/
|
||||||
No machine type has been defined. Your Makefile needs to have someing like
|
/* 64-bit Free BSD */
|
||||||
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
|
|
||||||
--- HDF4.2r2/mfhdf/libsrc/netcdf.h.in.orig 2008-02-04 18:38:14.000000000 +0100
|
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
|
||||||
+++ HDF4.2r2/mfhdf/libsrc/netcdf.h.in 2008-02-04 18:39:00.000000000 +0100
|
--- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 2010-02-01 13:28:25.373389124 -0700
|
||||||
@@ -295,7 +295,7 @@
|
+++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c 2010-02-01 13:28:25.419387130 -0700
|
||||||
*/
|
|
||||||
#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 */
|
|
||||||
--- HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h.orig 2008-02-04 18:40:01.000000000 +0100
|
|
||||||
+++ HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h 2008-02-04 18:40:29.000000000 +0100
|
|
||||||
@@ -304,7 +304,7 @@
|
|
||||||
*/
|
|
||||||
#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 */
|
|
||||||
--- HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.orig 2008-02-04 18:42:44.000000000 +0100
|
|
||||||
+++ HDF4.2r2/mfhdf/fortran/config/jackets-linux.c 2008-02-04 18:44:19.000000000 +0100
|
|
||||||
@@ -34,7 +34,7 @@
|
@@ -34,7 +34,7 @@
|
||||||
|
|
||||||
struct ncfils { /* This will be a common block from Fortran */
|
struct ncfils { /* This will be a common block from Fortran */
|
||||||
@ -108,7 +88,7 @@
|
|||||||
int ll;
|
int ll;
|
||||||
#else
|
#else
|
||||||
long ll;
|
long ll;
|
||||||
@@ -65,7 +65,7 @@
|
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
|
||||||
|
|
||||||
struct ncfils { /* This will be a common block from Fortran */
|
struct ncfils { /* This will be a common block from Fortran */
|
||||||
double dd;
|
double dd;
|
||||||
@ -117,7 +97,7 @@
|
|||||||
int ll;
|
int ll;
|
||||||
#else
|
#else
|
||||||
long ll;
|
long ll;
|
||||||
@@ -430,7 +430,7 @@
|
@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
|
||||||
}
|
}
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
|
|
||||||
@ -126,7 +106,7 @@
|
|||||||
/*
|
/*
|
||||||
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
||||||
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
||||||
@@ -916,7 +916,7 @@
|
@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -135,7 +115,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||||
long longs = *(int *)value;
|
long longs = *(int *)value;
|
||||||
@@ -1030,7 +1030,7 @@
|
@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -144,7 +124,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||||
long *longs = itol (value, ncount, ndims);
|
long *longs = itol (value, ncount, ndims);
|
||||||
@@ -1141,7 +1141,7 @@
|
@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||||
tmpbasis = nctypelen(NC_LONG);
|
tmpbasis = nctypelen(NC_LONG);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@ -153,7 +133,7 @@
|
|||||||
if (datatype == NC_LONG)
|
if (datatype == NC_LONG)
|
||||||
tmpbasis = sizeof(int);
|
tmpbasis = sizeof(int);
|
||||||
else
|
else
|
||||||
@@ -1198,7 +1198,7 @@
|
@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -162,7 +142,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
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);
|
||||||
@@ -1334,7 +1334,7 @@
|
@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -171,7 +151,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||||
long longs;
|
long longs;
|
||||||
@@ -1476,7 +1476,7 @@
|
@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -180,7 +160,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
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 */
|
||||||
@@ -1614,7 +1614,7 @@
|
@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||||
tmpbasis = nctypelen(NC_LONG);
|
tmpbasis = nctypelen(NC_LONG);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@ -189,7 +169,7 @@
|
|||||||
if (datatype == NC_LONG)
|
if (datatype == NC_LONG)
|
||||||
tmpbasis = sizeof(int);
|
tmpbasis = sizeof(int);
|
||||||
else
|
else
|
||||||
@@ -1685,7 +1685,7 @@
|
@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -198,7 +178,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
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 */
|
||||||
@@ -1851,7 +1851,7 @@
|
@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype,
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -207,7 +187,7 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
||||||
long *longs = itol (value, attlen, 1);
|
long *longs = itol (value, attlen, 1);
|
||||||
@@ -2016,7 +2016,7 @@
|
@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco
|
||||||
return;
|
return;
|
||||||
} /* else */
|
} /* else */
|
||||||
#endif /* FORTRAN_HAS_NO_SHORT */
|
#endif /* FORTRAN_HAS_NO_SHORT */
|
||||||
@ -216,40 +196,10 @@
|
|||||||
#ifdef HDF
|
#ifdef HDF
|
||||||
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
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
|
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
||||||
--- HDF4.2r2/mfhdf/ncgen/ncgen.l.orig 2008-02-04 18:45:37.000000000 +0100
|
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/array.c
|
||||||
+++ HDF4.2r2/mfhdf/ncgen/ncgen.l 2008-02-04 18:45:53.000000000 +0100
|
--- hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 2010-01-17 21:24:53.000000000 -0700
|
||||||
@@ -134,7 +134,7 @@
|
+++ hdf-4.2.4-snap8/mfhdf/libsrc/array.c 2010-02-01 13:28:25.422387595 -0700
|
||||||
yyerror(errstr);
|
@@ -622,7 +622,7 @@ xdr_NC_array(xdrs, app)
|
||||||
}
|
|
||||||
|
|
||||||
-#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)
|
|
||||||
--- HDF4.2r2/mfhdf/libsrc/putget.c.orig 2008-02-04 18:53:56.000000000 +0100
|
|
||||||
+++ HDF4.2r2/mfhdf/libsrc/putget.c 2008-02-04 18:53:13.000000000 +0100
|
|
||||||
@@ -594,7 +594,7 @@
|
|
||||||
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) ) ;
|
|
||||||
@@ -1896,7 +1896,7 @@
|
|
||||||
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 ;
|
|
||||||
--- HDF4.2r2/mfhdf/libsrc/array.c.orig 2008-02-04 18:54:30.000000000 +0100
|
|
||||||
+++ HDF4.2r2/mfhdf/libsrc/array.c 2008-02-04 18:54:39.000000000 +0100
|
|
||||||
@@ -622,7 +622,7 @@
|
|
||||||
case NC_LONG :
|
case NC_LONG :
|
||||||
#if defined _CRAYMPP
|
#if defined _CRAYMPP
|
||||||
xdr_NC_fnct = xdr_short;
|
xdr_NC_fnct = xdr_short;
|
||||||
@ -258,9 +208,10 @@
|
|||||||
xdr_NC_fnct = xdr_int ;
|
xdr_NC_fnct = xdr_int ;
|
||||||
#else
|
#else
|
||||||
xdr_NC_fnct = xdr_long ;
|
xdr_NC_fnct = xdr_long ;
|
||||||
--- HDF4.2r2/mfhdf/libsrc/cdf.c.orig 2008-02-04 18:55:23.000000000 +0100
|
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c
|
||||||
+++ HDF4.2r2/mfhdf/libsrc/cdf.c 2008-02-04 18:55:38.000000000 +0100
|
--- hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 2010-01-17 21:24:53.000000000 -0700
|
||||||
@@ -3664,7 +3664,7 @@
|
+++ 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 ;
|
alen /= 4 ;
|
||||||
#if defined _CRAYMPP
|
#if defined _CRAYMPP
|
||||||
xdr_NC_fnct = xdr_short;
|
xdr_NC_fnct = xdr_short;
|
||||||
@ -269,9 +220,55 @@
|
|||||||
xdr_NC_fnct = xdr_int ;
|
xdr_NC_fnct = xdr_int ;
|
||||||
#else
|
#else
|
||||||
xdr_NC_fnct = xdr_long ;
|
xdr_NC_fnct = xdr_long ;
|
||||||
--- HDF4.2r2/mfhdf/libsrc/xdrposix.c.orig 2008-02-04 18:56:24.000000000 +0100
|
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
|
||||||
+++ HDF4.2r2/mfhdf/libsrc/xdrposix.c 2008-02-04 18:58:43.000000000 +0100
|
--- hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 2010-02-01 13:28:25.380387278 -0700
|
||||||
@@ -284,7 +284,7 @@
|
+++ 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_getlong();
|
||||||
static bool_t xdrposix_putlong();
|
static bool_t xdrposix_putlong();
|
||||||
@ -280,7 +277,7 @@
|
|||||||
static bool_t xdrposix_getint();
|
static bool_t xdrposix_getint();
|
||||||
static bool_t xdrposix_putint();
|
static bool_t xdrposix_putint();
|
||||||
#endif
|
#endif
|
||||||
@@ -301,7 +301,7 @@
|
@@ -300,7 +300,7 @@ static long * xdrposix_inline();
|
||||||
#if (defined __sun && defined _LP64)
|
#if (defined __sun && defined _LP64)
|
||||||
static rpc_inline_t * xdrposix_inline();
|
static rpc_inline_t * xdrposix_inline();
|
||||||
#else
|
#else
|
||||||
@ -289,7 +286,7 @@
|
|||||||
static int32_t * xdrposix_inline();
|
static int32_t * xdrposix_inline();
|
||||||
#else
|
#else
|
||||||
#if (defined __alpha )
|
#if (defined __alpha )
|
||||||
@@ -332,9 +332,9 @@
|
@@ -331,9 +331,9 @@ static struct xdr_ops xdrposix_ops = {
|
||||||
xdrposix_getpos, /* get offset in the stream */
|
xdrposix_getpos, /* get offset in the stream */
|
||||||
xdrposix_setpos, /* set offset in the stream */
|
xdrposix_setpos, /* set offset in the stream */
|
||||||
xdrposix_inline, /* prime stream for inline macros */
|
xdrposix_inline, /* prime stream for inline macros */
|
||||||
@ -301,7 +298,7 @@
|
|||||||
NULL, /* no xdr_control function defined */
|
NULL, /* no xdr_control function defined */
|
||||||
#endif
|
#endif
|
||||||
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
||||||
@@ -469,7 +469,7 @@
|
@@ -468,7 +468,7 @@ xdrposix_getlong(xdrs, lp)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
unsigned char *up = (unsigned char *)lp ;
|
unsigned char *up = (unsigned char *)lp ;
|
||||||
@ -310,7 +307,7 @@
|
|||||||
*lp = 0 ;
|
*lp = 0 ;
|
||||||
up += (sizeof(long) - 4) ;
|
up += (sizeof(long) - 4) ;
|
||||||
#endif
|
#endif
|
||||||
@@ -496,7 +496,7 @@
|
@@ -495,7 +495,7 @@ xdrposix_putlong(xdrs, lp)
|
||||||
netlong mycopy = htonl(*lp);
|
netlong mycopy = htonl(*lp);
|
||||||
up = (unsigned char *)&mycopy;
|
up = (unsigned char *)&mycopy;
|
||||||
#endif
|
#endif
|
||||||
@ -319,7 +316,7 @@
|
|||||||
up += (sizeof(long) - 4) ;
|
up += (sizeof(long) - 4) ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -593,7 +593,7 @@
|
@@ -592,7 +592,7 @@ static rpc_inline_t *
|
||||||
#if (defined __alpha)
|
#if (defined __alpha)
|
||||||
static int*
|
static int*
|
||||||
#else
|
#else
|
||||||
@ -328,7 +325,7 @@
|
|||||||
static int32_t *
|
static int32_t *
|
||||||
#else
|
#else
|
||||||
static netlong *
|
static netlong *
|
||||||
@@ -622,7 +622,7 @@
|
@@ -621,7 +621,7 @@ int
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -337,3 +334,15 @@
|
|||||||
|
|
||||||
static bool_t
|
static bool_t
|
||||||
xdrposix_getint(xdrs, lp)
|
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,6 +1,6 @@
|
|||||||
diff -Nru HDF4.2r2.orig/hdf/src/hdfi.h HDF4.2r2/hdf/src/hdfi.h
|
diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc hdf-4.2.4-snap8/hdf/src/hdfi.h
|
||||||
--- HDF4.2r2.orig/hdf/src/hdfi.h 2007-09-17 18:45:17.000000000 +0300
|
--- hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc 2010-02-01 13:28:25.361387271 -0700
|
||||||
+++ HDF4.2r2/hdf/src/hdfi.h 2008-01-06 07:23:42.000000000 +0200
|
+++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:31:46.343387138 -0700
|
||||||
@@ -77,6 +77,7 @@
|
@@ -77,6 +77,7 @@
|
||||||
#define DFMT_LINUX64 0x4441
|
#define DFMT_LINUX64 0x4441
|
||||||
#define DFMT_POWERPC64 0x1111
|
#define DFMT_POWERPC64 0x1111
|
||||||
@ -9,7 +9,7 @@ diff -Nru HDF4.2r2.orig/hdf/src/hdfi.h HDF4.2r2/hdf/src/hdfi.h
|
|||||||
|
|
||||||
/* I/O library constants */
|
/* I/O library constants */
|
||||||
#define UNIXUNBUFIO 1
|
#define UNIXUNBUFIO 1
|
||||||
@@ -1444,6 +1445,66 @@
|
@@ -1392,6 +1393,66 @@ typedef long hdf_pint_t;
|
||||||
|
|
||||||
#endif /*Linux PPC */
|
#endif /*Linux PPC */
|
||||||
|
|
||||||
@ -73,6 +73,6 @@ diff -Nru HDF4.2r2.orig/hdf/src/hdfi.h HDF4.2r2/hdf/src/hdfi.h
|
|||||||
+
|
+
|
||||||
+#endif /* Linux Sparc32/64 */
|
+#endif /* Linux Sparc32/64 */
|
||||||
+
|
+
|
||||||
/*#ifndef GOT_MACHINE
|
/*-----------------------------------------------------*/
|
||||||
No machine type has been defined. Your Makefile needs to have someing like
|
/* 64-bit Free BSD */
|
||||||
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
|
|
11
hdf-4.2.5-maxavailfiles.patch
Normal file
11
hdf-4.2.5-maxavailfiles.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- hdf-4.2.5-pre1/mfhdf/libsrc/file.c.maxavailfiles 2010-02-06 10:40:42.000000000 -0700
|
||||||
|
+++ hdf-4.2.5-pre1/mfhdf/libsrc/file.c 2010-02-09 13:53:09.600285597 -0700
|
||||||
|
@@ -51,7 +51,7 @@
|
||||||
|
be in hlimits.h file in the future. EIP 2010-02-01*/
|
||||||
|
|
||||||
|
#define H4_MAX_AVAIL_OPENFILES 20000
|
||||||
|
-#define MAX_AVAIL_OPENFILES (((MAX_SYS_OPENFILES - 3) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 3))
|
||||||
|
+#define MAX_AVAIL_OPENFILES (((MAX_SYS_OPENFILES - 10) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 10))
|
||||||
|
|
||||||
|
static int _curr_opened = 0 ; /* the number of files currently opened */
|
||||||
|
/* NOTE: _ncdf might have been the number of files currently opened, yet it
|
@ -1,11 +0,0 @@
|
|||||||
--- HDF4.2r3/mfhdf/libsrc/file.c.maxavailfiles 2008-01-27 09:47:11.000000000 -0700
|
|
||||||
+++ HDF4.2r3/mfhdf/libsrc/file.c 2008-10-01 11:48:53.000000000 -0600
|
|
||||||
@@ -45,7 +45,7 @@
|
|
||||||
|
|
||||||
/* Maximum number of files can be opened at one time; subtract 3 from
|
|
||||||
the system allowed to account for stdin, stdout, and stderr */
|
|
||||||
-#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3)
|
|
||||||
+#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10)
|
|
||||||
|
|
||||||
static int _curr_opened = 0 ; /* the number of files currently opened */
|
|
||||||
/* NOTE: _ncdf might have been the number of files currently opened, yet it
|
|
@ -1,11 +0,0 @@
|
|||||||
--- HDF4.2r4/mfhdf/libsrc/tncunlim.c.buffer 2009-01-10 19:34:26.000000000 -0700
|
|
||||||
+++ HDF4.2r4/mfhdf/libsrc/tncunlim.c 2009-02-25 11:08:46.000000000 -0700
|
|
||||||
@@ -646,7 +646,7 @@
|
|
||||||
long dimsize = 0, /* unlimited dimension size */
|
|
||||||
dimsize1 = 0, dimsize2 = 0; /* other dimension sizes */
|
|
||||||
short outdata[DIM0][DIM1][DIM2]; /* data read back */
|
|
||||||
- char varname[10]; /* variable name */
|
|
||||||
+ char varname[12]; /* variable name */
|
|
||||||
nc_type rh_type; /* variable type */
|
|
||||||
int rh_ndims; /* number of dims */
|
|
||||||
int rh_dims[H4_MAX_VAR_DIMS]; /* variable shape */
|
|
26
hdf.spec
26
hdf.spec
@ -1,17 +1,15 @@
|
|||||||
Name: hdf
|
Name: hdf
|
||||||
Version: 4.2r4
|
Version: 4.2.5
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A general purpose library and file format for storing scientific data
|
Summary: A general purpose library and file format for storing scientific data
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://hdfgroup.org/products/hdf4/index.html
|
URL: http://hdfgroup.org/products/hdf4/index.html
|
||||||
Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF%{version}.tar.gz
|
Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/%{name}-%{version}.tar.bz2
|
||||||
Patch0: hdf-4.2r3-maxavailfiles.patch
|
Patch0: hdf-4.2.5-maxavailfiles.patch
|
||||||
Patch1: hdf-4.2r3-ppc.patch
|
Patch1: hdf-4.2.4-ppc.patch
|
||||||
Patch2: hdf-4.2r2-sparc.patch
|
Patch2: hdf-4.2.4-sparc.patch
|
||||||
Patch3: hdf-4.2r2-s390.patch
|
Patch3: hdf-4.2.4-s390.patch
|
||||||
# Reported upstream to help@hdfgroup.org
|
|
||||||
Patch4: hdf-4.2r4-buffer.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: flex byacc libjpeg-devel zlib-devel
|
BuildRequires: flex byacc libjpeg-devel zlib-devel
|
||||||
%if "%{?dist}" != ".el4"
|
%if "%{?dist}" != ".el4"
|
||||||
@ -43,12 +41,11 @@ HDF development headers and libraries.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n HDF%{version}
|
%setup -q
|
||||||
%patch0 -p1 -b .maxavailfiles
|
%patch0 -p1 -b .maxavailfiles
|
||||||
%patch1 -p1 -b .ppc
|
%patch1 -p1 -b .ppc
|
||||||
%patch2 -p1 -b .sparc
|
%patch2 -p1 -b .sparc
|
||||||
%patch3 -p1 -b .s390
|
%patch3 -p1 -b .s390
|
||||||
%patch4 -p1 -b .buffer
|
|
||||||
|
|
||||||
chmod a-x *hdf/*/*.c hdf/*/*.h
|
chmod a-x *hdf/*/*.c hdf/*/*.h
|
||||||
# restore include file timestamps modified by patching
|
# restore include file timestamps modified by patching
|
||||||
@ -84,7 +81,7 @@ for file in ncdump ncgen; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
# this is done to have the same timestamp on multiarch setups
|
# this is done to have the same timestamp on multiarch setups
|
||||||
touch -c -r README $RPM_BUILD_ROOT/%{_includedir}/hdf/h4config.h
|
touch -c -r README.txt $RPM_BUILD_ROOT/%{_includedir}/hdf/h4config.h
|
||||||
|
|
||||||
# Remove an autoconf conditional from the API that is unused and cause
|
# Remove an autoconf conditional from the API that is unused and cause
|
||||||
# the API to be different on x86 and x86_64
|
# the API to be different on x86 and x86_64
|
||||||
@ -104,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,0755)
|
%defattr(-,root,root,0755)
|
||||||
%doc COPYING MANIFEST README release_notes/*.txt
|
%doc COPYING MANIFEST README.txt release_notes/*.txt
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_mandir}/man1/*.gz
|
%{_mandir}/man1/*.gz
|
||||||
|
|
||||||
@ -115,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 2 2010 Orion Poplawski <orion@cora.nwra.com> 4.2.5-1
|
||||||
|
- Update to 4.2.5
|
||||||
|
|
||||||
* Fri Sep 18 2009 Orion Poplawski <orion@cora.nwra.com> 4.2r4-5
|
* Fri Sep 18 2009 Orion Poplawski <orion@cora.nwra.com> 4.2r4-5
|
||||||
- Add EL4 build conditionals
|
- Add EL4 build conditionals
|
||||||
|
|
||||||
|
1
import.log
Normal file
1
import.log
Normal file
@ -0,0 +1 @@
|
|||||||
|
hdf-4_2_5-1_fc14:F-12:hdf-4.2.5-1.fc14.src.rpm:1267563349
|
Loading…
Reference in New Issue
Block a user