[DHG_packages] 02/03: Revert "Merge Ubuntu PIE fixes on amd64 and ppc64el"

[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 7a01582f5703e59d3bd09ceaab639c0c0a7fc018
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Sep 27 17:03:29 2016 +0200

    Revert "Merge Ubuntu PIE fixes on amd64 and ppc64el"
    
    This reverts commit fdfd4bee89ea15317eab4d78360d4ad8842dcf29.
---
 p/ghc/debian/changelog | 4 ----
 p/ghc/debian/rules     | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 691fc85..b3f78af 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,11 +1,7 @@
 ghc (8.0.1-2) UNRELEASED; urgency=medium
 
-  [ Joachim Breitner ]
   * Merge from unstable (up to 7.0.3-9)
 
-  [ Matthias Klose ]
-  * Disable PIE on amd64 and ppc64el.
-
   [ Gianfranco Costamagna ]
   * Fix VCS fields
 
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index 4214109..2b897a8 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -30,13 +30,11 @@ export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 #  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 #endif
 
-pie_archs = amd64 ppc64el s390x
-
 ProjectVersion=$(shell cat VERSION)
 
 GHC=$(firstword $(shell bash -c "type -p ghc"))
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
-ifneq (,$(filter $(DEB_HOST_ARCH),$(pie_archs)))
+ifeq (s390x,$(DEB_HOST_ARCH))
   EXTRA_CONFIGURE_FLAGS += \
 	CONF_CC_OPTS_STAGE2=-fno-PIE \
 	CONF_GCC_LINKER_OPTS_STAGE2=-no-pie \
@@ -63,7 +61,7 @@ endif
 ifeq (armel,$(DEB_HOST_ARCH))
 	patch -p1 < debian/patches/armel-revert-ghci-fixes.patch
 endif
-ifneq (,$(filter $(DEB_HOST_ARCH),$(pie_archs)))
+ifeq (s390x,$(DEB_HOST_ARCH))
 	echo "SRC_CC_OPTS += -fno-PIE" >> mk/build.mk
 	echo "SRC_LD_OPTS += -no-pie" >> mk/build.mk
 endif

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