[DHG_packages] 03/08: ghc: Patch refresh for 8.0.2

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository DHG_packages.

commit f94f93999c1110ada1c069774a99fd6fed23eb6b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 19 08:56:47 2017 +0200

    ghc: Patch refresh for 8.0.2
---
 p/ghc/debian/patches/no-missing-haddock-file-warning  | 10 +++++-----
 p/ghc/debian/patches/osdecommitmemory-compat.patch    |  8 +++++---
 p/ghc/debian/patches/reproducible-tmp-names           | 10 +++++-----
 p/ghc/debian/patches/x32-use-native-x86_64-insn.patch |  8 +++++---
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/p/ghc/debian/patches/no-missing-haddock-file-warning b/p/ghc/debian/patches/no-missing-haddock-file-warning
index 363525a..eac921e 100644
--- a/p/ghc/debian/patches/no-missing-haddock-file-warning
+++ b/p/ghc/debian/patches/no-missing-haddock-file-warning
@@ -3,12 +3,12 @@ Description: Do not emit a warning if the .haddock file is missing
  without the -doc package.
 Author: Joachim Breitner <nomeata at debian.org>
 
-Index: ghc/utils/ghc-pkg/Main.hs
+Index: ghc-8.0.2/utils/ghc-pkg/Main.hs
 ===================================================================
---- ghc.orig/utils/ghc-pkg/Main.hs	2016-02-08 11:31:08.897241576 +0100
-+++ ghc/utils/ghc-pkg/Main.hs	2016-02-08 11:31:08.893241486 +0100
-@@ -1585,8 +1585,10 @@
-   mapM_ (checkDir True  "library-dirs") (libraryDirs pkg)
+--- ghc-8.0.2.orig/utils/ghc-pkg/Main.hs
++++ ghc-8.0.2/utils/ghc-pkg/Main.hs
+@@ -1588,8 +1588,10 @@
+   mapM_ (checkDir True  "dynamic-library-dirs") (libraryDynDirs pkg)
    mapM_ (checkDir True  "include-dirs") (includeDirs pkg)
    mapM_ (checkDir True  "framework-dirs") (frameworkDirs pkg)
 -  mapM_ (checkFile   True "haddock-interfaces") (haddockInterfaces pkg)
diff --git a/p/ghc/debian/patches/osdecommitmemory-compat.patch b/p/ghc/debian/patches/osdecommitmemory-compat.patch
index 001c01d..2c84d94 100644
--- a/p/ghc/debian/patches/osdecommitmemory-compat.patch
+++ b/p/ghc/debian/patches/osdecommitmemory-compat.patch
@@ -5,9 +5,11 @@ Bug: https://ghc.haskell.org/trac/ghc/ticket/12865
 Bug-Debian: https://bugs.debian.org/847677
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/rts/posix/OSMem.c
-+++ b/rts/posix/OSMem.c
-@@ -506,11 +506,24 @@ void osDecommitMemory(void *at, W_ size)
+Index: ghc-8.0.2/rts/posix/OSMem.c
+===================================================================
+--- ghc-8.0.2.orig/rts/posix/OSMem.c
++++ ghc-8.0.2/rts/posix/OSMem.c
+@@ -522,11 +522,24 @@
  
  #ifdef MADV_FREE
      // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
diff --git a/p/ghc/debian/patches/reproducible-tmp-names b/p/ghc/debian/patches/reproducible-tmp-names
index a0417f1..16ffc32 100644
--- a/p/ghc/debian/patches/reproducible-tmp-names
+++ b/p/ghc/debian/patches/reproducible-tmp-names
@@ -4,10 +4,10 @@ up in the resulting binary (in the debug section), but not the directory.
 Instead of using the process id, create a hash from the command line arguments,
 and assume that is going to be unique.
 
-Index: ghc/compiler/main/SysTools.hs
+Index: ghc-8.0.2/compiler/main/SysTools.hs
 ===================================================================
---- ghc.orig/compiler/main/SysTools.hs	2016-04-23 17:57:12.812255430 +0200
-+++ ghc/compiler/main/SysTools.hs	2016-04-23 17:57:12.808255337 +0200
+--- ghc-8.0.2.orig/compiler/main/SysTools.hs
++++ ghc-8.0.2/compiler/main/SysTools.hs
 @@ -65,6 +65,7 @@
  import Util
  import DynFlags
@@ -16,7 +16,7 @@ Index: ghc/compiler/main/SysTools.hs
  
  import LlvmCodeGen.Base (llvmVersionStr, supportedLlvmVersion)
  
-@@ -1158,8 +1159,8 @@
+@@ -1145,8 +1146,8 @@
      mapping <- readIORef dir_ref
      case Map.lookup tmp_dir mapping of
          Nothing -> do
@@ -27,7 +27,7 @@ Index: ghc/compiler/main/SysTools.hs
              mask_ $ mkTempDir prefix
          Just dir -> return dir
    where
-@@ -1575,6 +1576,13 @@
+@@ -1562,6 +1563,13 @@
  getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral
  #endif
  
diff --git a/p/ghc/debian/patches/x32-use-native-x86_64-insn.patch b/p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
index 0abe8d6..6105b5b 100644
--- a/p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
+++ b/p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
@@ -12,9 +12,11 @@ Description: Use native x86_64 instructions on x32
  See: https://ghc.haskell.org/trac/ghc/ticket/11571
  .
 
---- ghc-8.0.1.orig/rts/RtsSymbols.c
-+++ ghc-8.0.1/rts/RtsSymbols.c
-@@ -737,7 +737,7 @@
+Index: ghc-8.0.2/rts/RtsSymbols.c
+===================================================================
+--- ghc-8.0.2.orig/rts/RtsSymbols.c
++++ ghc-8.0.2/rts/RtsSymbols.c
+@@ -857,7 +857,7 @@
  
  
  // 64-bit support functions in libgcc.a

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