[DHG_packages] 04/04: ghc: refresh more patches

[Sean Whitton]

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

spwhitton pushed a commit to branch experimental
in repository DHG_packages.

commit 5a8d7f6f689cbb3b468758ae6afe47521b41c7b9
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Sat Sep 16 08:52:36 2017 -0700

    ghc: refresh more patches
---
 p/ghc/debian/changelog                             |  2 +-
 .../patches/avoid-CrossCompilerPrefix-stage2.patch | 10 ++++----
 .../patches/build-unlit-and-hp2ps-twice.patch      | 28 ++++++++++------------
 .../patches/use-stage1-binaries-for-install.patch  |  6 ++---
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index c938325..26a5268 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -5,7 +5,7 @@ ghc (8.2.1-2) UNRELEASED; urgency=medium
     - Drop osdecommitmemory-compat.patch from series file
       Merged upstream.
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Sat, 16 Sep 2017 08:49:25 -0700
+ -- Sean Whitton <spwhitton at spwhitton.name>  Sat, 16 Sep 2017 08:52:32 -0700
 
 ghc (8.2.1-1) experimental; urgency=medium
 
diff --git a/p/ghc/debian/patches/avoid-CrossCompilerPrefix-stage2.patch b/p/ghc/debian/patches/avoid-CrossCompilerPrefix-stage2.patch
index deeb2ed..28ed5a6 100644
--- a/p/ghc/debian/patches/avoid-CrossCompilerPrefix-stage2.patch
+++ b/p/ghc/debian/patches/avoid-CrossCompilerPrefix-stage2.patch
@@ -3,11 +3,11 @@ Origin: http://git.haskell.org/ghc.git/commitdiff/f2685df3b10e13f142736f28835e90
 Note: Can be dropped for 8.2.0
 Last-Update: 2017-08-02
 
---- ghc-8.0.2.orig/mk/config.mk.in
-+++ ghc-8.0.2/mk/config.mk.in
-@@ -518,11 +518,6 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_U
+--- a/mk/config.mk.in
++++ b/mk/config.mk.in
+@@ -530,11 +530,6 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_U
+ # needs to know which gcc you're using in order to perform its tests.
  
- WhatGccIsCalled       = @WhatGccIsCalled@
  GccVersion            = @GccVersion@
 -ifeq "$(phase)" "0"
 -CrossCompilePrefix    =
@@ -17,7 +17,7 @@ Last-Update: 2017-08-02
  # TargetPlatformFull retains the string passed to configure so we have it in
  # the necessary format to pass to libffi's configure.
  TargetPlatformFull    = @TargetPlatformFull@
-@@ -557,6 +552,11 @@ CrossCompiling        = @CrossCompiling@
+@@ -571,6 +566,11 @@ CrossCompiling        = @CrossCompiling@
  # See Note [Stage1Only vs stage=1]
  Stage1Only = NO
  
diff --git a/p/ghc/debian/patches/build-unlit-and-hp2ps-twice.patch b/p/ghc/debian/patches/build-unlit-and-hp2ps-twice.patch
index 53d6ba1..c025528 100644
--- a/p/ghc/debian/patches/build-unlit-and-hp2ps-twice.patch
+++ b/p/ghc/debian/patches/build-unlit-and-hp2ps-twice.patch
@@ -2,10 +2,8 @@ Description: Build unlit and hp2ps twice
 Author: Thomas Miedema <thomasmiedema at gmail.com>
         John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
 
-Index: ghc-8.0.1/utils/ghc-pkg/ghc.mk
-===================================================================
---- ghc-8.0.1.orig/utils/ghc-pkg/ghc.mk
-+++ ghc-8.0.1/utils/ghc-pkg/ghc.mk
+--- a/utils/ghc-pkg/ghc.mk
++++ b/utils/ghc-pkg/ghc.mk
 @@ -27,7 +27,7 @@ utils/ghc-pkg_PACKAGE = ghc-pkg
  # Note [Why build certain utils twice?]
  #
@@ -27,22 +25,22 @@ Index: ghc-8.0.1/utils/ghc-pkg/ghc.mk
  # Therefore we build fresh copies, using the stage1 compiler, and install them
  # when you run 'make install'. They are not used for any other purpose.
  
-Index: ghc-8.0.1/utils/hp2ps/ghc.mk
-===================================================================
---- ghc-8.0.1.orig/utils/hp2ps/ghc.mk
-+++ ghc-8.0.1/utils/hp2ps/ghc.mk
-@@ -17,10 +17,23 @@ utils/hp2ps_dist_C_SRCS          = AreaB
+--- a/utils/hp2ps/ghc.mk
++++ b/utils/hp2ps/ghc.mk
+@@ -17,7 +17,7 @@ utils/hp2ps_dist_C_SRCS          = AreaB
                                     Utilities.c
  utils/hp2ps_dist_EXTRA_LIBRARIES = m
- utils/hp2ps_dist_PROGNAME        = $(CrossCompilePrefix)hp2ps
+ utils/hp2ps_dist_PROGNAME        = hp2ps
 -utils/hp2ps_dist_INSTALL         = YES
 +utils/hp2ps_dist_INSTALL         = NO
  utils/hp2ps_dist_INSTALL_INPLACE = YES
- 
+ utils/hp2ps_dist_SHELL_WRAPPER              = YES
+ utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME = hp2ps
+@@ -25,3 +25,17 @@ utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_N
  utils/hp2ps_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS))
  
  $(eval $(call build-prog,utils/hp2ps,dist,0))
- 
++
 +utils/hp2ps_dist-install_C_SRCS  = AreaBelow.c Curves.c Error.c Main.c \
 +                                   Reorder.c TopTwenty.c AuxFile.c Deviation.c \
 +                                   HpFile.c Marks.c Scale.c TraceElement.c \
@@ -56,10 +54,8 @@ Index: ghc-8.0.1/utils/hp2ps/ghc.mk
 +
 +# See Note [Why build certain utils twice?].
 +$(eval $(call build-prog,utils/hp2ps,dist-install,1))
-Index: ghc-8.0.1/utils/unlit/ghc.mk
-===================================================================
---- ghc-8.0.1.orig/utils/unlit/ghc.mk
-+++ ghc-8.0.1/utils/unlit/ghc.mk
+--- a/utils/unlit/ghc.mk
++++ b/utils/unlit/ghc.mk
 @@ -13,8 +13,16 @@
  utils/unlit_dist_C_SRCS  = unlit.c
  utils/unlit_dist_PROGNAME = unlit
diff --git a/p/ghc/debian/patches/use-stage1-binaries-for-install.patch b/p/ghc/debian/patches/use-stage1-binaries-for-install.patch
index 897b0ef..d58cb2f 100644
--- a/p/ghc/debian/patches/use-stage1-binaries-for-install.patch
+++ b/p/ghc/debian/patches/use-stage1-binaries-for-install.patch
@@ -7,9 +7,9 @@ Description: Use the stage1 binaries for install
 Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
 Last-Update: 2017-01-29
 
---- ghc-8.0.1.orig/ghc.mk
-+++ ghc-8.0.1/ghc.mk
-@@ -958,8 +958,12 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdi
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -963,8 +963,12 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdi
  # Install packages in the right order, so that ghc-pkg doesn't complain.
  # Also, install ghc-pkg first.
  ifeq "$(Windows_Host)" "NO"

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