[Pkg-haskell-commits] darcs: ghc: Hack to get stable ABIs even when the build path changes. Closes: #785282

[Joachim Breitner]

Sun May 17 21:15:42 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Hack to get stable ABIs even when the build path changes. Closes: #785282

    M ./changelog +7
    A ./patches/buildpath-abi-stability.patch
    M ./patches/series +1

Sun May 17 21:15:42 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Hack to get stable ABIs even when the build path changes. Closes: #785282
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-17 21:18:28.620063215 +0000
+++ new-ghc/changelog	2015-05-17 21:18:28.624063307 +0000
@@ -1,3 +1,10 @@
+ghc (7.8.4-6) UNRELEASED; urgency=medium
+
+  * Hack to get stable ABIs even when the build path changes. Closes:
+    #785282
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 17 May 2015 23:15:28 +0200
+
 ghc (7.8.4-5) unstable; urgency=medium
 
   * New patch patches/PPC-relocations.patch by Colin Watson, Closes: #785194 
diff -rN -u old-ghc/patches/buildpath-abi-stability.patch new-ghc/patches/buildpath-abi-stability.patch
--- old-ghc/patches/buildpath-abi-stability.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/buildpath-abi-stability.patch	2015-05-17 21:18:28.648063854 +0000
@@ -0,0 +1,23 @@
+Index: ghc-7.8.4/compiler/iface/MkIface.lhs
+===================================================================
+--- ghc-7.8.4.orig/compiler/iface/MkIface.lhs	2015-05-17 23:15:16.294100501 +0200
++++ ghc-7.8.4/compiler/iface/MkIface.lhs	2015-05-17 23:15:16.294100501 +0200
+@@ -607,7 +607,7 @@
+    iface_hash <- computeFingerprint putNameLiterally
+                       (mod_hash,
+                        ann_fn (mkVarOcc "module"),  -- See mkIfaceAnnCache
+-                       mi_usages iface0,
++                       usages,
+                        sorted_deps,
+                        mi_hpc iface0)
+ 
+@@ -639,6 +639,9 @@
+     (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 ]
++
+ 
+ getOrphanHashes :: HscEnv -> [Module] -> IO [Fingerprint]
+ getOrphanHashes hsc_env mods = do
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2015-05-17 21:18:28.620063215 +0000
+++ new-ghc/patches/series	2015-05-17 21:18:28.652063946 +0000
@@ -9,3 +9,4 @@
 hurd.diff
 ghc-7.8.4-3-aarch64.patch
 PPC-relocations.patch
+buildpath-abi-stability.patch