[hdf4] 01/01: Fix ncgen test errors on arm64 (based on fedora changes)

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Sun Sep 21 19:51:05 UTC 2014


This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit 8d2f817479b96012c844c85c01e4376b0c8e7502
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sun Sep 21 20:43:07 2014 +0200

    Fix ncgen test errors on arm64 (based on fedora changes)
---
 debian/patches/hdf-4.2.10-aarch64.patch | 320 +-------------------------------
 debian/patches/series                   |   2 +
 2 files changed, 10 insertions(+), 312 deletions(-)

diff --git a/debian/patches/hdf-4.2.10-aarch64.patch b/debian/patches/hdf-4.2.10-aarch64.patch
index 71a0b26..a9c107c 100644
--- a/debian/patches/hdf-4.2.10-aarch64.patch
+++ b/debian/patches/hdf-4.2.10-aarch64.patch
@@ -1,327 +1,23 @@
 Author: Marcin Juswkiewicz
 Origin: https://bugs.launchpad.net/ubuntu/+source/libhdf4/+bug/1296303
-Description: Add Aarch64 support
-Index: hdf-4.2.10/hdf/src/hconv.h
+Description: Add Aarch64 support -only part of the original patch
+Index: hdf-4.2.10/HDF4/mfhdf/ncgen/ncgen.l
 ===================================================================
---- hdf-4.2.10.orig/hdf/src/hconv.h
-+++ hdf-4.2.10/hdf/src/hconv.h
-@@ -59,7 +59,7 @@
- /* CONSTANT DEFINITIONS                                                      */
- /*****************************************************************************/
- /* Generally Big-Endian machines */
--#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__)
-+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__)
- #       define UI8_IN     DFKnb1b   /* Unsigned Integer, 8 bits */
- #       define UI8_OUT    DFKnb1b
- #       define SI16_IN    DFKnb2b   /* S = Signed */
-Index: hdf-4.2.10/hdf/src/hdfi.h
-===================================================================
---- hdf-4.2.10.orig/hdf/src/hdfi.h
-+++ hdf-4.2.10/hdf/src/hdfi.h
-@@ -79,6 +79,7 @@
- #define     DFMT_LINUXSPARC     0x1111
- #define     DFMT_LINUX390       0x1111
- #define     DFMT_LINUXARM       0x4441
-+#define     DFMT_LINUXAARCH64   0x4441
- 
- /* I/O library constants */
- #define UNIXUNBUFIO 1
-@@ -1337,6 +1338,44 @@ typedef long              hdf_pint_t;
- 
- #endif /* IA64 */
- 
-+/* Linux AArch64 */
-+#if defined __aarch64__
-+
-+#ifdef GOT_MACHINE
-+If you get an error on this line more than one machine type has been defined.
-+Please check your Makefile.
-+#endif
-+#define GOT_MACHINE
-+
-+#include <sys/file.h>               /* for unbuffered i/o stuff */
-+#include <sys/stat.h>
-+#define DF_MT             DFMT_LINUXAARCH64
-+typedef void              VOID;
-+typedef void              *VOIDP;
-+typedef char              *_fcd;
-+typedef char              char8;
-+typedef unsigned char     uchar8;
-+typedef char              int8;
-+typedef unsigned char     uint8;
-+typedef short int         int16;
-+typedef unsigned short int uint16;
-+typedef int               int32;
-+typedef unsigned int      uint32;
-+typedef int               intn;
-+typedef unsigned int      uintn;
-+typedef int               intf;     /* size of INTEGERs in Fortran compiler */
-+typedef float             float32;
-+typedef double            float64;
-+typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
-+#define FNAME_POST_UNDERSCORE
-+#define _fcdtocp(desc) (desc)
-+#ifdef  HAVE_FMPOOL
-+#define FILELIB PAGEBUFIO  /* enable page buffering */
-+#else
-+#define FILELIB UNIXBUFIO
-+#endif
-+#endif /* Linux AArch64 */
-+
- #ifndef GOT_MACHINE
- No machine type has been defined.  Your Makefile needs to have someing like
- -DSUN or -DUNICOS in order for the HDF internal structures to be defined
-Index: hdf-4.2.10/mfhdf/fortran/jackets.c.in
-===================================================================
---- hdf-4.2.10.orig/mfhdf/fortran/jackets.c.in
-+++ hdf-4.2.10/mfhdf/fortran/jackets.c.in
-@@ -34,7 +34,7 @@
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
-     int ll;
- #else
-     long ll;
-@@ -65,7 +65,7 @@ struct ncfils {			/* This will be a comm
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
-     int ll;
- #else
-     long ll;
-@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims)
- }
- #endif /* FORTRAN_HAS_NO_SHORT */
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- /*
-  * Convert multi-dimensional array of NCLONGs stored in ints to packed
-  * array of longs, in malloc'ed space.  Returns pointer to longs or NULL
-@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs = *(int *)value;
-@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, ncount, ndims);
-@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itolg (value, ncount, nbasis, ndims);
-@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs;
-@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype,
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, attlen, 1);
-@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- /* EIP  We need to use int buffer to read data in on the platforms where long is 8 bytes
-Index: hdf-4.2.10/mfhdf/libsrc/array.c
-===================================================================
---- hdf-4.2.10.orig/mfhdf/libsrc/array.c
-+++ hdf-4.2.10/mfhdf/libsrc/array.c
-@@ -620,7 +620,7 @@ xdr_NC_array(xdrs, app)
- 		xdr_NC_fnct = xdr_shorts ;
- 		goto func ;
- 	case NC_LONG :
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- 		xdr_NC_fnct = xdr_int ;
- #else
- 		xdr_NC_fnct = xdr_long ;
-Index: hdf-4.2.10/mfhdf/libsrc/cdf.c
-===================================================================
---- hdf-4.2.10.orig/mfhdf/libsrc/cdf.c
-+++ hdf-4.2.10/mfhdf/libsrc/cdf.c
-@@ -3662,7 +3662,7 @@ NC_var *vp ;
-         break ;
-     case NC_LONG :
-         alen /= 4 ;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
-         xdr_NC_fnct = xdr_int ;
- #else
-         xdr_NC_fnct = xdr_long ;
-Index: hdf-4.2.10/mfhdf/libsrc/netcdf.h.in
-===================================================================
---- hdf-4.2.10.orig/mfhdf/libsrc/netcdf.h.in
-+++ hdf-4.2.10/mfhdf/libsrc/netcdf.h.in
-@@ -293,7 +293,7 @@ typedef double        ncdouble;
- /* 
-  * Variables/attributes of type NC_LONG should use the C type 'nclong'
-  */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- /*
-  * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
-  * http://www.unix.org/version2/whatsnew/lp64_wp.html
-Index: hdf-4.2.10/mfhdf/libsrc/putget.c
-===================================================================
---- hdf-4.2.10.orig/mfhdf/libsrc/putget.c
-+++ hdf-4.2.10/mfhdf/libsrc/putget.c
-@@ -664,7 +664,7 @@ Void *values ;
- 	case NC_SHORT :
- 		return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
- 	case NC_LONG :
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- 		return( xdr_int(xdrs, (nclong *)values) ) ;
- #else
- 		return( xdr_long(xdrs, (nclong *)values) ) ;
-@@ -1975,7 +1975,7 @@ Void *values ;
- 		} /* else */
- 		return(TRUE) ;
- 	case NC_LONG :
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- 		xdr_NC_fnct = xdr_int ;
- #else
- 		xdr_NC_fnct = xdr_long ;
-Index: hdf-4.2.10/mfhdf/libsrc/xdrposix.c
-===================================================================
---- hdf-4.2.10.orig/mfhdf/libsrc/xdrposix.c
-+++ hdf-4.2.10/mfhdf/libsrc/xdrposix.c
-@@ -250,7 +250,7 @@ int nbytes;
- 
- static bool_t   xdrposix_getlong();
- static bool_t   xdrposix_putlong();
--#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- static bool_t   xdrposix_getint();
- static bool_t   xdrposix_putint();
- #endif
-@@ -264,7 +264,7 @@ static long *    xdrposix_inline();
- #if (defined __sun && defined _LP64)
- static rpc_inline_t *    xdrposix_inline();
- #else
--#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
-+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- static int32_t *    xdrposix_inline();
- #else
- #if (defined __alpha )
-@@ -294,9 +294,9 @@ static struct xdr_ops   xdrposix_ops = {
-     xdrposix_getpos,    /* get offset in the stream */
-     xdrposix_setpos,    /* set offset in the stream */
-     xdrposix_inline,    /* prime stream for inline macros */
--#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
-     xdrposix_destroy,   /* destroy stream */
--#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined  __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
-+#if !(defined __aarch64__) && !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined  __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
-     NULL,               /* no xdr_control function defined */
- #endif 
-     /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
-@@ -552,7 +552,7 @@ static rpc_inline_t *
- #if (defined  __alpha)
- static int* 
- #else
--#if ((defined  __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
-+#if ((defined  __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- static int32_t * 
- #else
- static netlong * 
-@@ -580,7 +580,7 @@ int
-     return (NULL);
- }
- 
--#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64  || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64  || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __aarch64__
- 
- static bool_t
- xdrposix_getint(xdrs, lp)
-Index: hdf-4.2.10/mfhdf/ncgen/ncgen.l
-===================================================================
---- hdf-4.2.10.orig/mfhdf/ncgen/ncgen.l
-+++ hdf-4.2.10/mfhdf/ncgen/ncgen.l
+--- hdf-4.2.10.orig/HDF4/mfhdf/ncgen/ncgen.l
++++ hdf-4.2.10/HDF4/mfhdf/ncgen/ncgen.l
 @@ -113,7 +113,7 @@ FloatInf|Infinity|Inf	{    /* float miss
  		    yyerror(errstr);
  		}
  
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__
+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__
  		if (dd < INT_MIN  ||  dd > INT_MAX) 
  #else
  		if (dd < LONG_MIN  ||  dd > LONG_MAX) 
-Index: hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
+Index: hdf-4.2.10/HDF4/mfhdf/ncgen/ncgenyy.c
 ===================================================================
---- hdf-4.2.10.orig/mfhdf/ncgen/ncgenyy.c
-+++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
+--- hdf-4.2.10.orig/HDF4/mfhdf/ncgen/ncgenyy.c
++++ hdf-4.2.10/HDF4/mfhdf/ncgen/ncgenyy.c
 @@ -989,7 +989,7 @@ YY_RULE_SETUP
  		    yyerror(errstr);
  		}
diff --git a/debian/patches/series b/debian/patches/series
index 600238b..99a7653 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,8 @@ hdfi.h
 #config
 kfreebsd
 ppc64el.diff
+hdf-4.2.10-aarch64.patch
 install-examples.diff
 missing-includes.diff
 fix_string_literals.diff
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git



More information about the Pkg-grass-devel mailing list