[cdo] 36/84: Fix for FTBFS on powerpc

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository cdo.

commit ddc324bff635a652d435ae0ae2fb088f5ae4d371
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Aug 30 20:09:14 2013 +0100

    Fix for FTBFS on powerpc
---
 debian/changelog |  6 ++++--
 debian/rules     | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55fe017..d65913e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-cdo (1.6.1+dfsg.1-2) UNRELEASED; urgency=low
+cdo (1.6.1+dfsg.1-2) unstable; urgency=low
 
   * Add updated watch file. 
   * grib-api now works on sparc. Re-enable dependency here.
+  * Don't use --as-needed and -fPIE on powerpc. armel. Closes: #720298.
+  * Building with serial hdf5: Closes: #712829.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Fri, 30 Aug 2013 17:53:59 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 02 Sep 2013 07:53:59 +0100
 
 cdo (1.6.1+dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 19ce474..f771816 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,19 +22,27 @@ CPPFLAGS += -DgFortran
 ARCH:=$(shell dpkg --print-architecture)
 WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
 WITH_JASPER:= --with-jasper=/usr
+AS_NEEDED= -Wl,--as-needed
 
 # export LIBTOOLIZE=true
 
-# On amd64, arm*, don't do fPIE, only relro
+# On powerpc, amd64, arm*, don't do fPIE, only relro
 ifeq ($(ARCH), amd64)
   export LDFLAGS= -Wl,-z,relro -Wl,-z,now
 endif
 ifeq ($(ARCH), armel)
   export LDFLAGS= -Wl,-z,relro -Wl,-z,now
+  export AS_NEEDED=
+  export CFLAGS= -g -O2 -Wall
 endif
 ifeq ($(ARCH), armhf)
   export LDFLAGS= -Wl,-z,relro -Wl,-z,now
 endif
+ifeq ($(ARCH),powerpc)
+  export LDFLAGS= -Wl,-z,relro -Wl,-z,now
+  export AS_NEEDED=
+  export CFLAGS= -g -O2 -Wall
+endif
 
 # grib-api not available on these arches; jasper is only needed for grib-api
 ifeq ($(ARCH), mips)
@@ -72,7 +80,7 @@ override_dh_auto_configure:
 		--enable-iso-c-interface   --with-magics=/usr \
 		 $(WITH_GRIB) $(WITH_JASPER)  FC=gfortran \
 		LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \
-		LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
+		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"
 	#rm -f libtool libcdi/libtool
 	#ln -sf /usr/bin/libtool libtool
 	#ln -sf /usr/bin/libtool libcdi/libtool

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git