[DHG_packages] 05/16: ghc: Remove patch reproducible-tmp-names.

[Joachim Breitner]

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

nomeata pushed a commit to branch jessie-backports
in repository DHG_packages.

commit b67f5482f7449e1ec968abf604aa737b1f5fcb14
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Jul 26 09:51:37 2015 +0200

    ghc: Remove patch reproducible-tmp-names.
    
    It requires at least GHC-7.8 to build, so prevents bootstrapping on jessie, and does not provide critical functionality.
---
 p/ghc/debian/changelog                      |  9 +++++
 p/ghc/debian/patches/reproducible-tmp-names | 54 -----------------------------
 p/ghc/debian/patches/series                 |  1 -
 3 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 259b5c8..2f6819e 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,12 @@
+ghc (7.8.4-9~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+  * Remove patch reproducible-tmp-names. It requires at least GHC-7.8 to
+    build, so prevents bootstrapping on jessie, and does not provide critical
+    functionality.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 26 Jul 2015 09:31:07 +0200
+
 ghc (7.8.4-9) unstable; urgency=medium
 
   * Another stab at making GHC more reproducible: Use a hash of the command
diff --git a/p/ghc/debian/patches/reproducible-tmp-names b/p/ghc/debian/patches/reproducible-tmp-names
deleted file mode 100644
index 6284859..0000000
--- a/p/ghc/debian/patches/reproducible-tmp-names
+++ /dev/null
@@ -1,54 +0,0 @@
-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.8.4/compiler/main/SysTools.lhs
-===================================================================
---- ghc-7.8.4.orig/compiler/main/SysTools.lhs	2014-12-19 16:35:34.000000000 +0100
-+++ ghc-7.8.4/compiler/main/SysTools.lhs	2015-06-07 16:20:31.875021456 +0200
-@@ -58,6 +58,7 @@
- import Util
- import DynFlags
- import Exception
-+import Fingerprint
-
- import Data.IORef
- import Control.Monad
-@@ -1011,8 +1012,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
-@@ -1031,8 +1031,8 @@
-     mapping <- readIORef dir_ref
-     case Map.lookup tmp_dir mapping of
-         Nothing -> do
--            pid <- getProcessID
--            let prefix = tmp_dir </> "ghc" ++ show pid ++ "_"
-+            pid <- getStableProcessID
-+            let prefix = tmp_dir </> "ghc" ++ pid ++ "_"
-             mask_ $ mkTempDir prefix
-         Just dir -> return dir
-   where
-@@ -1347,6 +1347,14 @@
- getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral
- #endif
-
-+-- Debian-specific hack to get reproducible output, by not using the "random"
-+-- pid, but rather something determinisic
-+getStableProcessID :: IO String
-+getStableProcessID = do
-+    args <- getArgs
-+    return $ take 4 $ show $ fingerprintString $ unwords args
-+
-+
- -- Divvy up text stream into lines, taking platform dependent
- -- line termination into account.
- linesPlatform :: String -> [String]
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index a2ca4da..769def4 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -10,5 +10,4 @@ hurd.diff
 ghc-7.8.4-3-aarch64.patch
 PPC-relocations.patch
 buildpath-abi-stability.patch
-reproducible-tmp-names
 stable-specialization-rule-names

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