[DHG_packages] 01/02: Revert "GHC: Import Ubuntu fPIE patch"

[Gianfranco Costamagna]

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

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

commit 7ddaae3161f0d68188ded984d218dc9e128bbc59
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Sep 27 16:58:36 2016 +0200

    Revert "GHC: Import Ubuntu fPIE patch"
    
    This reverts commit 176885a9b0c93aff1e927299ac6eb87fd128c9a8.
---
 p/ghc/debian/changelog | 7 -------
 p/ghc/debian/rules     | 6 ++----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 1ee77ff..84394c2 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,10 +1,3 @@
-ghc (7.10.3-10) UNRELEASED; urgency=medium
-
-  * Disable PIE on amd64, ppc64el and s390x
-    (change taken from Ubuntu, Closes: #712228)
-
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 11 Sep 2016 10:37:24 +0200
-
 ghc (7.10.3-9) unstable; urgency=medium
 
   * Improve debian/watch file.
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index 0085995..779d315 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 \
@@ -62,7 +60,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