diff options
| author | Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | 2016-09-27 15:01:06 (GMT) |
|---|---|---|
| committer | Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | 2016-09-27 15:01:06 (GMT) |
| commit | 3354959ffaddb30572e3609841f20a26859323ff (patch) | |
| tree | b6f78af2a74f2348ea418d3d1f28860abcc8a3b2 /p/ghc/debian | |
| parent | 7ddaae3161f0d68188ded984d218dc9e128bbc59 (diff) | |
Disable PIE, new patch from Balint Reczey
Diffstat (limited to 'p/ghc/debian')
| -rw-r--r-- | p/ghc/debian/changelog | 8 | ||||
| -rwxr-xr-x | p/ghc/debian/rules | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog index 84394c2..77467de 100644 --- a/p/ghc/debian/changelog +++ b/p/ghc/debian/changelog @@ -1,3 +1,11 @@ +ghc (7.10.3-10) UNRELEASED; urgency=medium + + [ Balint Reczey ] + * Disable PIE to fix build when PIE is the default in gcc + (change taken/revised from Ubuntu, Closes: #712228) + + -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 27 Sep 2016 17:00:13 +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 779d315..faae250 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/ @@ -60,10 +60,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 |