[Git][haskell-team/DHG_packages][master] ghc: add lower-optimization-for-unreg.patch

[Sean Whitton]

Sean Whitton pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
8eb6ac00 by Sean Whitton at 2018-02-18T10:28:56-07:00
ghc: add lower-optimization-for-unreg.patch

- - - - -


3 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/lower-optimization-for-unreg.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,7 +1,11 @@
 ghc (8.0.2-12) UNRELEASED; urgency=medium
 
+  [ Ilias Tsitsimpis ]
   * Use salsa.debian.org URLs in Vcs-{Browser,Git} fields
 
+  [ Sean Whitton ]
+  * Add lower-optimization-for-unreg.patch (Closes: #890763).
+
  -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 09 Feb 2018 20:44:09 +0200
 
 ghc (8.0.2-11) unstable; urgency=medium


=====================================
p/ghc/debian/patches/lower-optimization-for-unreg.patch
=====================================
--- /dev/null
+++ b/p/ghc/debian/patches/lower-optimization-for-unreg.patch
@@ -0,0 +1,39 @@
+Description: mk/config.mk.in: lower -O2 optimization down to -O1 on UNREG
+Author: Sergei Trofimovich <slyfox at gentoo.org>
+Origin: upstream, http://git.haskell.org/ghc.git/commitdiff/432a1f18327a50d7b2bbdbe6b004473fe1b0b0b9
+Last-Update: 2018-02-17
+
+--- ghc-8.0.2.orig/mk/config.mk.in
++++ ghc-8.0.2/mk/config.mk.in
+@@ -70,15 +70,6 @@ GhcStage1HcOpts=
+ GhcStage2HcOpts=-O2
+ GhcStage3HcOpts=-O2
+ 
+-# Disable -O2 optimization. Otherwise amount of generated C code
+-# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs')
+-# and sometimes not compile at all (powerpc64 overflows something
+-# on 'compiler/hsSyn/HsExpr.lhs').
+-ifeq "$(GhcUnregisterised)" "YES"
+-GhcStage1HcOpts=
+-GhcStage2HcOpts=
+-GhcStage3HcOpts=
+-endif
+ 
+ # Note [Stage number in build variables].
+ #
+@@ -892,3 +883,15 @@ GMP_LIB_DIRS = @GMP_LIB_DIRS@
+ 
+ CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@
+ CURSES_LIB_DIRS = @CURSES_LIB_DIRS@
++
++# Disable -O2 optimization. Otherwise amount of generated C code
++# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs')
++# and sometimes not compile at all (powerpc64 overflows something
++# on 'compiler/hsSyn/HsExpr.lhs').
++ifeq "$(GhcUnregisterised)" "YES"
++GhcStage1HcOpts=
++GhcStage2HcOpts=
++GhcStage3HcOpts=
++
++GhcLibHcOpts=
++endif


=====================================
p/ghc/debian/patches/series
=====================================
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -12,3 +12,4 @@ use-stage1-binaries-for-install.patch
 build-unlit-and-hp2ps-twice.patch
 avoid-CrossCompilerPrefix-stage2.patch
 fix-hssplicety.patch
+lower-optimization-for-unreg.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/8eb6ac00a552b37adb7d2551f8ca6d4bdd925154

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/8eb6ac00a552b37adb7d2551f8ca6d4bdd925154
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20180218/daa6603d/attachment-0001.html>