[DHG_packages] 01/01: ghc: drop avoid-CrossCompilerPrefix-stage2.patch

[Clint Adams]

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

clint pushed a commit to branch experimental
in repository DHG_packages.

commit 179d8827961b01d5dcdd657aa39e5b276800d8a1
Author: Clint Adams <clint at debian.org>
Date:   Sun Sep 17 07:52:38 2017 -0400

    ghc: drop avoid-CrossCompilerPrefix-stage2.patch
---
 p/ghc/debian/changelog                             |  8 ++++--
 .../patches/avoid-CrossCompilerPrefix-stage2.patch | 31 ----------------------
 p/ghc/debian/patches/series                        |  1 -
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index f0f6ba0..661687f 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,11 +1,15 @@
-ghc (8.2.1-2) UNRELEASED; urgency=medium
+ghc (8.2.1-2) experimental; urgency=medium
 
+  [ Sean Whitton ]
   * Upload to experimental again, after merging in changes from unstable.
     - Refresh patches.
     - Drop osdecommitmemory-compat.patch from series file
       Merged upstream.
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Sat, 16 Sep 2017 08:52:32 -0700
+  [ Clint Adams ]
+  * Drop avoid-CrossCompilerPrefix-stage2.patch.
+
+ -- Clint Adams <clint at debian.org>  Sun, 17 Sep 2017 07:52:14 -0400
 
 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
deleted file mode 100644
index 28ed5a6..0000000
--- a/p/ghc/debian/patches/avoid-CrossCompilerPrefix-stage2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Don't use cross-compile prefix for stage2 cross-builds
-Origin: http://git.haskell.org/ghc.git/commitdiff/f2685df3b10e13f142736f28835e9064334bc143
-Note: Can be dropped for 8.2.0
-Last-Update: 2017-08-02
-
---- 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.
- 
- GccVersion            = @GccVersion@
--ifeq "$(phase)" "0"
--CrossCompilePrefix    =
--else
--CrossCompilePrefix    = @CrossCompilePrefix@
--endif
- # TargetPlatformFull retains the string passed to configure so we have it in
- # the necessary format to pass to libffi's configure.
- TargetPlatformFull    = @TargetPlatformFull@
-@@ -571,6 +566,11 @@ CrossCompiling        = @CrossCompiling@
- # See Note [Stage1Only vs stage=1]
- Stage1Only = NO
- 
-+# Installed tools prefix:
-+#    we add prefix to crosscompiler GHC only (ghc-stage1),
-+#    not cross-built GHC (not ghc-stage2).
-+CrossCompilePrefix    = $(if $(filter YES,$(Stage1Only)), at CrossCompilePrefix@,)
-+
- # Install stage 2 by default, or stage 1 in the cross compiler
- # case. Can be changed to 3
- INSTALL_GHC_STAGE= $(if $(filter YES,$(Stage1Only)),1,2)
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index bbdf2a3..59b9bca 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -8,4 +8,3 @@ do-not-use-SHELL
 x32-use-native-x86_64-insn.patch
 use-stage1-binaries-for-install.patch
 build-unlit-and-hp2ps-twice.patch
-avoid-CrossCompilerPrefix-stage2.patch

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