[cdo] 15/84: Don't use fPIE on amd64, arm*

[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 abf632d3dbf79410e2ff48f2222169a1689c4dd6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 31 22:49:06 2012 +0000

    Don't use fPIE on amd64, arm*
---
 debian/changelog |  6 ++++++
 debian/rules     | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 035f082..b8dd233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cdo (1.5.9+dfsg.1-5) UNRELEASED; urgency=low
+
+  * Don't use -fPIE on amd64, arm*. FTBFS then. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 31 Dec 2012 22:48:19 +0000
+
 cdo (1.5.9+dfsg.1-4) unstable; urgency=low
 
   * Should be libpng12-dev. Closes: #696971, #697020.
diff --git a/debian/rules b/debian/rules
index b529d54..1fa146e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,17 @@ ARCH:=$(shell dpkg --print-architecture)
 WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
 WITH_JASPER:= --with-jasper=/usr
 
+# On 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
+endif
+ifeq ($(ARCH), armhf)
+  export LDFLAGS= -Wl,-z,relro -Wl,-z,now
+endif
+
 # grib-api not available on these arches; jasper is only needed for grib-api
 ifeq ($(ARCH), mips)
   WITH_GRIB:=

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