Control: tags -1 patch

Hi,

On Sat, 04 Jan 2014 11:26:48 +0000 Alastair McKinstry <mckins...@debian.org> 
wrote:
> Building ncl with libhdf4-alt-dev, it FTBFS on mips and mipsel due to:
> 
> cc -ansi  -fPIC -g -O2 -Wformat -Werror=format-security    
> -I../../../.././include -I/usr/include/freetype2 -I/usr/include/gdal  
> -I/usr/include/hdf-eos5 -I/usr/include/hdf   -DBuildRasterHDF -DLINUX 
> -DBuildRasterHPPCL -DBuildRasterNrif -DBuildRasterSun          
> -DBuildRasterXWD  -DBuildRasterAVS -DBuildRasterSGI             
> -DBuildRasterAbekas  -DBuildRasterBinary -DBuildRasterYUV               
> -DNGTMPDIR='"tmp"' -Dmips -DIBM -DSYSV -D_POSIX_SOURCE -D_XOPEN_SOURCE 
> -DByteSwapped -DNeedFuncProto  -D_FORTIFY_SOURCE=2  -c -o hdf.o hdf.c
> In file included from /usr/include/hdf/hdf.h:20:0,
>                  from hdf.c:54:
> /usr/include/hdf/hdfi.h:1886:1: error: unknown type name 'No'
>  No machine type has been defined.  Your Makefile needs to have someing like

This is caused by compiling with -ansi which suppresses the non-ansi
MIPSEB and MIPSEL defines hdfi.h uses. This can be fixed by using
__MIPSEB__ and __MIPSEL__ instead, and I've attached a patch which does
this.

Note this fix is unrelated to any of the mips64el stuff which is also
going on at the minute.

Thanks,
James

diff -ur a/debian/patches/hdfi.h b/debian/patches/hdfi.h
--- a/debian/patches/hdfi.h	2015-03-01 16:04:15.000000000 +0000
+++ b/debian/patches/hdfi.h	2015-03-13 15:33:42.559914610 +0000
@@ -293,7 +291,7 @@
 +
 +#endif /* Linux/s390 */
 +
-+#if defined (__linux__) && (defined (MIPSEB) || defined(MIPSEL))
++#if defined (__linux__) && (defined (__MIPSEB__) || defined(__MIPSEL__))
 +
 +#ifdef GOT_MACHINE
 +If you get an error on this line more than one machine type has been defined.
@@ -307,9 +305,9 @@
 +#include <unistd.h>
 +#include <ctype.h>          /* for character macros */
 +
-+#if defined (MIPSEB)
++#if defined (__MIPSEB__)
 +#define DF_MT             DFMT_MIPSEB
-+#elif defined(MIPSEL)
++#elif defined(__MIPSEL__)
 +#define DF_MT		  DFMT_MIPSEL
 +#endif
 +

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to