[shapelib] 01/01: Fixed #742148

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository shapelib.

commit d4e9041b4b9770d26e1a11b4b382cf787fa75055
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 26 11:49:59 2014 +0100

    Fixed #742148
---
 debian/changelog                                   |  9 +++++
 ...ix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1adb13e..8b38480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+shapelib (1.3.0-3) unstable; urgency=medium
+
+  [ Cyril Brulebois ]
+  * Fix FTBFS on powerpc by prefixing _{BIG,LITTLE}_ENDIAN with
+    LIBSHAPE. (Names starting with an underscore are reserved.).
+    (Closes: #742148)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 26 Mar 2014 11:49:19 +0100
+
 shapelib (1.3.0-2) unstable; urgency=medium
 
   * Moved to DEP5 copyright format and annotated double licensing,
diff --git a/debian/patches/0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch b/debian/patches/0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch
new file mode 100644
index 0000000..ebaffbb
--- /dev/null
+++ b/debian/patches/0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch
@@ -0,0 +1,39 @@
+Description: Avoid clashing with _*_ENDIAN.
+Author: Cyril Brulebois <kibi at debian.org>
+
+Defining _{LITTLE,BIG}_ENDIAN is a bad idea since it can clash with
+architecture-specific #define's. So prefix those with LIBSHAPE to
+avoid name clashing.
+---
+Origin: Debian
+Bug-Debian: http://bugs.debian.org/742148
+Last-Update: 2014-03-26
+
+--- a/contrib/Makefile
++++ b/contrib/Makefile
+@@ -2,8 +2,8 @@
+ #LINKOPT	=	/usr/local/lib/libdbmalloc.a
+ #CFLAGS	=	-g
+ 
+-# Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
+-ENDIAN	=	-D_LITTLE_ENDIAN
++# Endian: define either LIBSHAPE_LITTLE_ENDIAN or LIBSHAPE_BIG_ENDIAN
++ENDIAN	=	-DLIBSHAPE_LITTLE_ENDIAN
+ 
+ CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
+ 
+--- a/contrib/my_nan.h
++++ b/contrib/my_nan.h
+@@ -26,10 +26,10 @@
+ 
+ /* IEEE Not A Number.  */
+ 
+-#ifdef _BIG_ENDIAN
++#ifdef LIBSHAPE_BIG_ENDIAN
+ #  define	__nan_bytes		{ 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 }
+ #endif
+-#ifdef _LITTLE_ENDIAN
++#ifdef LIBSHAPE_LITTLE_ENDIAN
+ #  define	__nan_bytes		{ 0, 0, 0, 0, 0, 0, 0xf8, 0x7f }
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0f4f152..3094ebb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0003-Properly-use-libtool.patch
 0004-Dynamically-link-the-shp-binaries-to-libshp.patch
 0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch
+0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch

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