[DHG_packages] 03/03: Merge Bálint Réczey patch

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch experimental
in repository DHG_packages.

commit 82675d128739cc38e2e47e1026c11de3b0355780
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Sep 27 17:05:08 2016 +0200

    Merge Bálint Réczey patch
---
 p/ghc/debian/changelog |  6 +++++-
 p/ghc/debian/rules     | 13 ++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index b3f78af..7486639 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,6 +1,6 @@
 ghc (8.0.1-2) UNRELEASED; urgency=medium
 
-  * Merge from unstable (up to 7.0.3-9)
+  * Merge from unstable (up to 7.0.3-10)
 
   [ Gianfranco Costamagna ]
   * Fix VCS fields
@@ -9,6 +9,10 @@ ghc (8.0.1-2) UNRELEASED; urgency=medium
   * Depend on haskell-devscripts-minimal instead of duplicating its
     functionality.
 
+  [ Balint Reczey ]
+  * Disable PIE to fix build when PIE is the default in gcc
+    (change taken/revised from Ubuntu, Closes: #712228)
+
  -- Sven Bartscher <kritzefitz at debian.org>  Tue, 19 Jul 2016 20:01:34 +0200
 
 ghc (8.0.1-1) experimental; urgency=medium
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index 2b897a8..cb0a23c 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -34,12 +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 += \
+EXTRA_CONFIGURE_FLAGS += \
+	LDFLAGS=-no-pie CFLAGS=-fno-PIE \
 	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/
 
@@ -61,10 +61,9 @@ endif
 ifeq (armel,$(DEB_HOST_ARCH))
 	patch -p1 < debian/patches/armel-revert-ghci-fixes.patch
 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
+echo "SRC_HC_OPTS += -optc-fno-PIE -optl-no-pie" >> mk/build.mk
+echo "SRC_CC_OPTS += -fno-PIE" >> mk/build.mk
+echo "SRC_LD_OPTS += -no-pie" >> mk/build.mk
 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