[packages/ghc] rediffed patches

[atler]

commit ba30ea44e804cec2f5737b22482c9a8ecc47e705
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Mar 20 14:35:23 2021 +0100

    rediffed patches

 buildpath-abi-stability.patch | 2 +-
 ghc-pld.patch                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/buildpath-abi-stability.patch b/buildpath-abi-stability.patch
index c58fb11..0fd5668 100644
--- a/buildpath-abi-stability.patch
+++ b/buildpath-abi-stability.patch
@@ -14,8 +14,8 @@ Index: ghc-8.8.1+dfsg1/compiler/iface/MkIface.hs
                         mi_hpc iface0)
  
 @@ -748,6 +748,9 @@
+     (non_orph_rules, orph_rules) = mkOrphMap ifRuleOrph    (mi_rules iface0)
      (non_orph_fis,   orph_fis)   = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
-     fix_fn = mi_fix_fn iface0
      ann_fn = mkIfaceAnnCache (mi_anns iface0)
 +    -- Do not allow filenames to affect the interface
 +    usages = [ case u of UsageFile _ fp -> UsageFile "" fp; _ -> u | u <- mi_usages iface0 ]
diff --git a/ghc-pld.patch b/ghc-pld.patch
index dd15d99..2efaa08 100644
--- a/ghc-pld.patch
+++ b/ghc-pld.patch
@@ -8,7 +8,7 @@
 +        i386|i486|i586|i686)
              test -z "[$]2" || eval "[$]2=ArchX86"
              ;;
-         x86_64)
+         x86_64|amd64)
 @@ -229,7 +229,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
  
      checkVendor() {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghc.git/commitdiff/6d507b632ff1c6737787817db35f795868c0315b