[DHG_packages] 01/01: Disable PIE on s390x, since Ubuntu's toolchain defaults to enabling it there (closes: #807366).

[Colin Watson]

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

cjwatson pushed a commit to branch master
in repository DHG_packages.

commit 0841dd198c7ba0636be063895818d6b239ecf220
Author: Colin Watson <cjwatson at debian.org>
Date:   Tue Dec 8 12:01:16 2015 +0000

    Disable PIE on s390x, since Ubuntu's toolchain defaults to enabling it there (closes: #807366).
---
 p/ghc/debian/changelog |  7 +++++++
 p/ghc/debian/rules     | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 3e858b0..d2ceb0f 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,10 @@
+ghc (7.10.3-4) UNRELEASED; urgency=medium
+
+  * Disable PIE on s390x, since Ubuntu's toolchain defaults to enabling it
+    there (closes: #807366).
+
+ -- Colin Watson <cjwatson at debian.org>  Tue, 08 Dec 2015 11:59:35 +0000
+
 ghc (7.10.3-3) unstable; urgency=medium
 
   * Platform detection support for sh4 (Closes: #807108). Thanks to John Paul
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index b285537..ca8d8f3 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -34,6 +34,12 @@ ProjectVersion=$(shell cat VERSION)
 
 GHC=$(firstword $(shell bash -c "type -p ghc"))
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
+ifeq (s390x,$(DEB_HOST_ARCH))
+  EXTRA_CONFIGURE_FLAGS += \
+	CONF_CC_OPTS_STAGE2=-fno-PIE \
+	CONF_GCC_LINKER_OPTS_STAGE2=-no-pie \
+	CONF_LD_LINKER_OPTS_STAGE2=-no-pie
+endif
 BUILD_HADDOCK_DOCS=YES
 DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
 
@@ -51,6 +57,10 @@ endif
 ifeq (armhf,$(DEB_HOST_ARCH))
 	echo "SRC_HC_OPTS += -D__ARM_PCS_VFP" >> mk/build.mk
 endif
+ifeq (s390x,$(DEB_HOST_ARCH))
+	echo "SRC_CC_OPTS += -fno-PIE" >> mk/build.mk
+	echo "SRC_LD_OPTS += -no-pie" >> mk/build.mk
+endif
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 #	echo "GhcStage1HcOpts += -DDEBUG" >> mk/build.mk
 #	echo "GhcStage2HcOpts += -DDEBUG" >> mk/build.mk

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