[postgis] 01/01: Add patches to support ppc64el architecture.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository postgis.

commit 73776c0b722cc634323ad94dcccbf7cd360603dc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 27 23:04:39 2014 +0200

    Add patches to support ppc64el architecture.
---
 debian/changelog                          |  9 +++++++++
 debian/patches/add-lm-for-liblwgeom.patch | 14 ++++++++++++++
 debian/patches/enable-ppc64el.patch       | 15 +++++++++++++++
 debian/patches/postgres-9.4-fixes.patch   |  2 +-
 debian/patches/series                     |  2 ++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a50eccb..3d2084a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+postgis (2.1.3+dfsg-5) UNRELEASED; urgency=medium
+
+  [ Paulo Flabiano Smorigo ]
+  * add -lm for liblwgeom to avoid linkage problem.
+  * enable ppc64el.
+    (closes: #759505)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 27 Aug 2014 22:42:21 +0200
+
 postgis (2.1.3+dfsg-4) unstable; urgency=low
 
   [ Bas Couwenberg ]
diff --git a/debian/patches/add-lm-for-liblwgeom.patch b/debian/patches/add-lm-for-liblwgeom.patch
new file mode 100644
index 0000000..85adf9e
--- /dev/null
+++ b/debian/patches/add-lm-for-liblwgeom.patch
@@ -0,0 +1,14 @@
+Description: Add -lm for liblwgeom to support building on ppc64el
+Author: Paulo Flabiano Smorigo <pfsmorigo at linux.vnet.ibm.com>
+
+--- a/liblwgeom/Makefile.in
++++ b/liblwgeom/Makefile.in
+@@ -13,7 +13,7 @@
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
+-LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
++LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c -lm @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
+ NUMERICFLAGS = @NUMERICFLAGS@
+ top_builddir = @top_builddir@
+ prefix = @prefix@
diff --git a/debian/patches/enable-ppc64el.patch b/debian/patches/enable-ppc64el.patch
new file mode 100644
index 0000000..0954813
--- /dev/null
+++ b/debian/patches/enable-ppc64el.patch
@@ -0,0 +1,15 @@
+Description: Add support for ppc64el in libtool macros.
+Author: Paulo Flabiano Smorigo <pfsmorigo at linux.vnet.ibm.com>
+
+--- a/macros/libtool.m4
++++ b/macros/libtool.m4
+@@ -1352,6 +1352,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_x86_64"
+ 	    ;;
++	  powerpc64le-*)
++	    LD="${LD-ld} -m elf64lppc"
++		;;
+ 	  ppc*-*linux*|powerpc*-*linux*)
+ 	    LD="${LD-ld} -m elf64ppc"
+ 	    ;;
diff --git a/debian/patches/postgres-9.4-fixes.patch b/debian/patches/postgres-9.4-fixes.patch
index d8a1782..464d7d9 100644
--- a/debian/patches/postgres-9.4-fixes.patch
+++ b/debian/patches/postgres-9.4-fixes.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 Origin: upstream, http://trac.osgeo.org/postgis/ticket/2685
 --- a/regress/run_test.pl
 +++ b/regress/run_test.pl
-@@ -572,7 +572,7 @@
+@@ -572,7 +572,7 @@ sub run_simple_test
  
  	# Strip the lines we don't care about
  	@lines = grep(!/^\$/, @lines);
diff --git a/debian/patches/series b/debian/patches/series
index 45fbfab..eaf5af1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ fix-manpage
 de-translation
 use-json-c
 postgres-9.4-fixes.patch
+add-lm-for-liblwgeom.patch
+enable-ppc64el.patch

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