[Pkg-haskell-commits] darcs: ghc: Merge from unstable

[Joachim Breitner]

Mon May 25 10:02:25 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable

    M ./changelog +60
    M ./patches/reproducible-tmp-names +30
    M ./patches/series +3
    M ./rules +4

Mon May 25 10:02:25 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-25 10:08:20.760550848 +0000
+++ new-ghc/changelog	2015-05-25 10:08:20.768551046 +0000
@@ -1,3 +1,63 @@
+ghc (7.10.1-5) experimental; urgency=medium
+
+  * Merge from unstable (Closes: #785282, #785194 )
+  * A lucky guess at making GHC build reproducible, by not putting the process
+    id in temporary filenames.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 24 May 2015 10:47:09 +0200
+
+ghc (7.10.1-4) experimental; urgency=medium
+
+  * Fix patch/ghc-7.8.4-3-aarch64.patch; dropped a hunk when upgrading to
+    7.10 that I should not have dropped. Thanks Gianfranco Costamagna for
+    noticing.
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 14 May 2015 23:16:55 +0200
+
+ghc (7.10.1-3) experimental; urgency=medium
+
+  * Apply patch by Sergei Trofimovich to implement load_/store_load_barrier on
+    armv6 and older (upstream ticket #10244)
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 14 May 2015 09:37:06 +0200
+
+ghc (7.10.1-2) experimental; urgency=medium
+
+  * Build against llvm-3.5 (Closes: 784245) 
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 13 May 2015 11:18:54 +0200
+
+ghc (7.10.1-1) experimental; urgency=medium
+
+  * New upstream release. Optimistically dropping lots of patches, lets see
+    what now works out of the box.
+  * Ship haddock with ghc, and leave (most) paths as they are. It is easier to
+    not fight against the way upstream builds and installs stuff.
+  * Remove the hack introduced in 7.2.0 for a clean upgrade from 7.0.3.
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 12 May 2015 12:41:40 +0200
+
+ghc (7.8.4-7) unstable; urgency=medium
+
+  * Remove useless *.haddock.t files (upstream bug 10410)
+  * A lucky guess at making GHC build reproducible, by not putting the process
+    id in temporary filenames.
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 25 May 2015 11:06:54 +0200
+
+ghc (7.8.4-6) unstable; urgency=medium
+
+  * Hack to get stable ABIs even when the build path changes. Closes:
+    #785282
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 21 May 2015 10:35:25 +0200
+
+ghc (7.8.4-5) unstable; urgency=medium
+
+  * New patch patches/PPC-relocations.patch by Colin Watson, Closes: #785194 
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 13 May 2015 21:06:05 +0200
+
 ghc (7.8.4-4) unstable; urgency=medium
 
   * Apply hurd compatibility patch by Pino
diff -rN -u old-ghc/patches/reproducible-tmp-names new-ghc/patches/reproducible-tmp-names
--- old-ghc/patches/reproducible-tmp-names	2015-05-25 10:08:20.760550848 +0000
+++ new-ghc/patches/reproducible-tmp-names	2015-05-25 10:08:20.780551351 +0000
@@ -0,0 +1,30 @@
+This is an attempt to make GHC build reproducible. The name of .c files may end
+up in the resulting binary (in the debug section), but not the directory.
+
+Since the temporary directory already contains the process id, there is no need
+to put it into the filename as well.
+
+Index: ghc-7.10.1/compiler/main/SysTools.hs
+===================================================================
+--- ghc-7.10.1.orig/compiler/main/SysTools.hs	2015-03-21 23:30:07.000000000 +0100
++++ ghc-7.10.1/compiler/main/SysTools.hs	2015-05-24 10:45:40.537513384 +0200
+@@ -1072,8 +1072,7 @@
+ newTempName :: DynFlags -> Suffix -> IO FilePath
+ newTempName dflags extn
+   = do d <- getTempDir dflags
+-       x <- getProcessID
+-       findTempName (d </> "ghc" ++ show x ++ "_")
++       findTempName (d </> "ghc_")
+   where
+     findTempName :: FilePath -> IO FilePath
+     findTempName prefix
+@@ -1088,8 +1087,7 @@
+ newTempLibName :: DynFlags -> Suffix -> IO (FilePath, FilePath, String)
+ newTempLibName dflags extn
+   = do d <- getTempDir dflags
+-       x <- getProcessID
+-       findTempName d ("ghc" ++ show x ++ "_")
++       findTempName d ("ghc_")
+   where
+     findTempName :: FilePath -> String -> IO (FilePath, FilePath, String)
+     findTempName dir prefix
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2015-05-25 10:08:20.760550848 +0000
+++ new-ghc/patches/series	2015-05-25 10:08:20.780551351 +0000
@@ -3,3 +3,6 @@
 no-missing-haddock-file-warning
 hurd.diff
 ghc-7.8.4-3-aarch64.patch
+PPC-relocations.patch
+buildpath-abi-stability.patch
+reproducible-tmp-names
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2015-05-25 10:08:20.760550848 +0000
+++ new-ghc/rules	2015-05-25 10:08:20.784551452 +0000
@@ -137,6 +137,10 @@
 	# Delete all the library LICENSE files
 	rm -f debian/tmp/usr/share/doc/ghc-doc/html/libraries/*/LICENSE
 
+	# Remove the haddock.t files, they really should not be in the released
+	# package (upstream #10410)
+	find debian/tmp -name \*.haddock.t -delete
+
 	# Generate lintian overrides
 	mkdir -p debian/tmp/usr/share/lintian/overrides
 	echo "ghc binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc/Cabal-*/Distribution/License.hi`" >> debian/tmp/usr/share/lintian/overrides/ghc