[DHG_packages] 01/02: ghc: New upstream release candiate (8.0.1-rc1)
Joachim Breitner
nomeata at moszumanska.debian.org
Thu Jan 14 19:52:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch experimental
in repository DHG_packages.
commit 589f81ffd225af9a4f8f5361d1fa7dcd848aff6d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Thu Jan 14 16:23:58 2016 +0100
ghc: New upstream release candiate (8.0.1-rc1)
---
p/ghc/debian/changelog | 10 ++
p/ghc/debian/patches/ARM-VFPv3D16 | 8 +-
p/ghc/debian/patches/buildpath-abi-stability.patch | 10 +-
.../debian/patches/cabal-show-detail-direct.patch | 103 ------------
p/ghc/debian/patches/hurd.diff | 28 ++--
.../debian/patches/no-missing-haddock-file-warning | 8 +-
p/ghc/debian/patches/reproducible-tmp-names | 14 +-
p/ghc/debian/patches/series | 3 -
.../patches/sh4-platform-detection-support.patch | 28 ----
.../patches/sparc64-initial-platform-support.patch | 174 ---------------------
p/ghc/debian/patches/use-debian-gen_contents_index | 26 +--
11 files changed, 58 insertions(+), 354 deletions(-)
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 38063d0..a7ce12c 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,13 @@
+ghc (8.0.0.20160111-1) experimental; urgency=medium
+
+ * New upstream release candiate (8.0.1-rc1)
+ Dropped patches
+ + cabal-show-detail-direct
+ + sh4-platform-detection-support
+ + parc64-initial-platform-support
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 14 Jan 2016 16:16:37 +0100
+
ghc (7.10.3-6) unstable; urgency=medium
* Let GHC break cabal-install (<< 1.22), due to
diff --git a/p/ghc/debian/patches/ARM-VFPv3D16 b/p/ghc/debian/patches/ARM-VFPv3D16
index 3c51d22..379b74c 100644
--- a/p/ghc/debian/patches/ARM-VFPv3D16
+++ b/p/ghc/debian/patches/ARM-VFPv3D16
@@ -6,11 +6,11 @@ Author: Jani Monoses <jani at ubuntu.com>
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
-Index: ghc-7.10.1/aclocal.m4
+Index: ghc/aclocal.m4
===================================================================
---- ghc-7.10.1.orig/aclocal.m4 2015-05-11 22:23:40.197727806 +0200
-+++ ghc-7.10.1/aclocal.m4 2015-05-11 22:23:40.197727806 +0200
-@@ -411,7 +411,7 @@
+--- ghc.orig/aclocal.m4 2016-01-14 16:19:24.858462215 +0100
++++ ghc/aclocal.m4 2016-01-14 16:19:24.854462134 +0100
+@@ -420,7 +420,7 @@
)],
[changequote(, )dnl
ARM_ISA=ARMv7
diff --git a/p/ghc/debian/patches/buildpath-abi-stability.patch b/p/ghc/debian/patches/buildpath-abi-stability.patch
index b6f46b6..9c2d0a6 100644
--- a/p/ghc/debian/patches/buildpath-abi-stability.patch
+++ b/p/ghc/debian/patches/buildpath-abi-stability.patch
@@ -1,10 +1,10 @@
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
-Index: ghc-7.10.1/compiler/iface/MkIface.hs
+Index: ghc/compiler/iface/MkIface.hs
===================================================================
---- ghc-7.10.1.orig/compiler/iface/MkIface.hs 2015-05-17 20:34:02.808643844 +0200
-+++ ghc-7.10.1/compiler/iface/MkIface.hs 2015-05-17 20:34:02.804643799 +0200
-@@ -611,7 +611,7 @@
+--- ghc.orig/compiler/iface/MkIface.hs 2016-01-14 16:21:42.065241716 +0100
++++ ghc/compiler/iface/MkIface.hs 2016-01-14 16:21:42.061241634 +0100
+@@ -557,7 +557,7 @@
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -13,7 +13,7 @@ Index: ghc-7.10.1/compiler/iface/MkIface.hs
sorted_deps,
mi_hpc iface0)
-@@ -644,6 +644,9 @@
+@@ -590,6 +590,9 @@
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
diff --git a/p/ghc/debian/patches/cabal-show-detail-direct.patch b/p/ghc/debian/patches/cabal-show-detail-direct.patch
deleted file mode 100644
index 0aec818..0000000
--- a/p/ghc/debian/patches/cabal-show-detail-direct.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-commit 3792d212a6f60573ef43dd72088a353725d09461
-Author: Joachim Breitner <mail at joachim-breitner.de>
-Date: Thu Nov 5 11:31:12 2015 +0100
-
- test: New mode --show-details=direct
-
- This mode implements #2911, and allows to connect the test runner
- directly to stdout/stdin. This is more reliable in the presence of no
- threading, i.e. a work-arond for #2398.
-
- I make the test suite use this, so that it passes again, despite
- printing lots of stuff. Once #2398 is fixed properly, the test suite
- should probably be extended to test all the various --show-details
- modes.
-
-Index: ghc/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs
-===================================================================
---- ghc.orig/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs 2015-11-05 12:36:38.385252394 +0100
-+++ ghc/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs 2015-11-05 12:36:38.377252228 +0100
-@@ -1725,7 +1725,7 @@
- -- * Test flags
- -- ------------------------------------------------------------
-
--data TestShowDetails = Never | Failures | Always | Streaming
-+data TestShowDetails = Never | Failures | Always | Streaming | Direct
- deriving (Eq, Ord, Enum, Bounded, Show)
-
- knownTestShowDetails :: [TestShowDetails]
-@@ -1813,7 +1813,8 @@
- ("'always': always show results of individual test cases. "
- ++ "'never': never show results of individual test cases. "
- ++ "'failures': show results of failing test cases. "
-- ++ "'streaming': show results of test cases in real time.")
-+ ++ "'streaming': show results of test cases in real time."
-+ ++ "'direct': send results of test cases in real time; no log file.")
- testShowDetails (\v flags -> flags { testShowDetails = v })
- (reqArg "FILTER"
- (readP_to_E (\_ -> "--show-details flag expects one of "
-Index: ghc/libraries/Cabal/Cabal/Distribution/Simple/Test/ExeV10.hs
-===================================================================
---- ghc.orig/libraries/Cabal/Cabal/Distribution/Simple/Test/ExeV10.hs 2015-11-05 12:36:38.385252394 +0100
-+++ ghc/libraries/Cabal/Cabal/Distribution/Simple/Test/ExeV10.hs 2015-11-05 12:36:38.377252228 +0100
-@@ -30,7 +30,7 @@
- , getCurrentDirectory, removeDirectoryRecursive )
- import System.Exit ( ExitCode(..) )
- import System.FilePath ( (</>), (<.>) )
--import System.IO ( hGetContents, hPutStr, stdout )
-+import System.IO ( hGetContents, hPutStr, stdout, stderr )
-
- runTest :: PD.PackageDescription
- -> LBI.LocalBuildInfo
-@@ -63,15 +63,20 @@
- -- Write summary notices indicating start of test suite
- notice verbosity $ summarizeSuiteStart $ PD.testName suite
-
-- (rOut, wOut) <- createPipe
-+ (wOut, wErr, logText) <- case details of
-+ Direct -> return (stdout, stderr, "")
-+ _ -> do
-+ (rOut, wOut) <- createPipe
-+
-+ -- Read test executable's output lazily (returns immediately)
-+ logText <- hGetContents rOut
-+ -- Force the IO manager to drain the test output pipe
-+ void $ forkIO $ length logText `seq` return ()
-
-- -- Read test executable's output lazily (returns immediately)
-- logText <- hGetContents rOut
-- -- Force the IO manager to drain the test output pipe
-- void $ forkIO $ length logText `seq` return ()
-+ -- '--show-details=streaming': print the log output in another thread
-+ when (details == Streaming) $ void $ forkIO $ hPutStr stdout logText
-
-- -- '--show-details=streaming': print the log output in another thread
-- when (details == Streaming) $ void $ forkIO $ hPutStr stdout logText
-+ return (wOut, wOut, logText)
-
- -- Run the test executable
- let opts = map (testOption pkg_descr lbi suite)
-@@ -93,7 +98,7 @@
-
- exit <- rawSystemIOWithEnv verbosity cmd opts Nothing (Just shellEnv')
- -- these handles are automatically closed
-- Nothing (Just wOut) (Just wOut)
-+ Nothing (Just wOut) (Just wErr)
-
- -- Generate TestSuiteLog from executable exit code and a machine-
- -- readable test log.
-@@ -112,12 +117,10 @@
- -- Show the contents of the human-readable log file on the terminal
- -- if there is a failure and/or detailed output is requested
- let whenPrinting = when $
-- (details > Never)
-- && (not (suitePassed $ testLogs suiteLog) || details == Always)
-+ ( details == Always ||
-+ details == Failures && not (suitePassed $ testLogs suiteLog))
- -- verbosity overrides show-details
- && verbosity >= normal
-- -- if streaming, we already printed the log
-- && details /= Streaming
- whenPrinting $ putStr $ unlines $ lines logText
-
- -- Write summary notice to terminal indicating end of test suite
diff --git a/p/ghc/debian/patches/hurd.diff b/p/ghc/debian/patches/hurd.diff
index 6a9119e..8602124 100644
--- a/p/ghc/debian/patches/hurd.diff
+++ b/p/ghc/debian/patches/hurd.diff
@@ -1,17 +1,19 @@
Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
-Index: ghc-7.10/aclocal.m4
+Index: ghc/aclocal.m4
===================================================================
---- ghc-7.10.orig/aclocal.m4 2015-06-15 09:26:58.080646221 +0200
-+++ ghc-7.10/aclocal.m4 2015-06-15 09:26:58.076646183 +0200
-@@ -271,12 +271,15 @@
+--- ghc.orig/aclocal.m4 2016-01-14 16:20:19.683572714 +0100
++++ ghc/aclocal.m4 2016-01-14 16:21:18.024754631 +0100
+@@ -277,7 +277,7 @@
nto-qnx)
test -z "[$]2" || eval "[$]2=OSQNXNTO"
;;
-- dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
-+ dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+- dragonfly|osf1|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix|irix)
++ dragonfly|osf1|hpux|linuxaout|freebsd2|nextstep2|nextstep3|sunos4|ultrix|irix)
test -z "[$]2" || eval "[$]2=OSUnknown"
;;
+ aix)
+@@ -286,6 +286,9 @@
linux-android)
test -z "[$]2" || eval "[$]2=OSAndroid"
;;
@@ -21,22 +23,22 @@ Index: ghc-7.10/aclocal.m4
*)
echo "Unknown OS '[$]1'"
exit 1
-Index: ghc-7.10/compiler/utils/Platform.hs
+Index: ghc/compiler/utils/Platform.hs
===================================================================
---- ghc-7.10.orig/compiler/utils/Platform.hs 2015-06-15 09:26:58.080646221 +0200
-+++ ghc-7.10/compiler/utils/Platform.hs 2015-06-15 09:26:58.076646183 +0200
-@@ -83,6 +83,7 @@
- | OSOsf3
+--- ghc.orig/compiler/utils/Platform.hs 2016-01-14 16:20:19.683572714 +0100
++++ ghc/compiler/utils/Platform.hs 2016-01-14 16:20:40.067985654 +0100
+@@ -88,6 +88,7 @@
| OSQNXNTO
| OSAndroid
+ | OSAIX
+ | OSHurd
deriving (Read, Show, Eq)
-- | ARM Instruction Set Architecture, Extensions and ABI
-@@ -127,6 +128,7 @@
- -- per comment below it's safe
+@@ -141,6 +142,7 @@
osElfTarget OSQNXNTO = False
osElfTarget OSAndroid = True
+ osElfTarget OSAIX = False
+osElfTarget OSHurd = True
osElfTarget OSUnknown = False
-- Defaulting to False is safe; it means don't rely on any
diff --git a/p/ghc/debian/patches/no-missing-haddock-file-warning b/p/ghc/debian/patches/no-missing-haddock-file-warning
index b6ad6fa..2241b28 100644
--- a/p/ghc/debian/patches/no-missing-haddock-file-warning
+++ b/p/ghc/debian/patches/no-missing-haddock-file-warning
@@ -3,11 +3,11 @@ 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-7.10/utils/ghc-pkg/Main.hs
+Index: ghc/utils/ghc-pkg/Main.hs
===================================================================
---- ghc-7.10.orig/utils/ghc-pkg/Main.hs 2015-07-22 11:17:04.787751658 +0200
-+++ ghc-7.10/utils/ghc-pkg/Main.hs 2015-07-22 11:17:04.787751658 +0200
-@@ -1533,8 +1533,10 @@
+--- ghc.orig/utils/ghc-pkg/Main.hs 2016-01-14 16:19:29.426554736 +0100
++++ ghc/utils/ghc-pkg/Main.hs 2016-01-14 16:19:29.426554736 +0100
+@@ -1592,8 +1592,10 @@
mapM_ (checkDir True "library-dirs") (libraryDirs pkg)
mapM_ (checkDir True "include-dirs") (includeDirs pkg)
mapM_ (checkDir True "framework-dirs") (frameworkDirs pkg)
diff --git a/p/ghc/debian/patches/reproducible-tmp-names b/p/ghc/debian/patches/reproducible-tmp-names
index e1950ee..f6f7922 100644
--- a/p/ghc/debian/patches/reproducible-tmp-names
+++ b/p/ghc/debian/patches/reproducible-tmp-names
@@ -6,17 +6,17 @@ and assume that is going to be unique.
Index: ghc/compiler/main/SysTools.hs
===================================================================
---- ghc.orig/compiler/main/SysTools.hs 2015-11-02 17:23:05.410365013 +0100
-+++ ghc/compiler/main/SysTools.hs 2015-11-02 17:23:05.410365013 +0100
-@@ -66,6 +66,7 @@
+--- ghc.orig/compiler/main/SysTools.hs 2016-01-14 16:21:54.613495968 +0100
++++ ghc/compiler/main/SysTools.hs 2016-01-14 16:21:54.609495887 +0100
+@@ -65,6 +65,7 @@
import Util
import DynFlags
import Exception
+import Fingerprint
- import Data.IORef
- import Control.Monad
-@@ -1152,8 +1153,8 @@
+ import LlvmCodeGen.Base (llvmVersionStr, supportedLlvmVersion)
+
+@@ -1135,8 +1136,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
-@@ -1531,6 +1532,13 @@
+@@ -1510,6 +1511,13 @@
getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral
#endif
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index c6d7a85..6dad111 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -4,6 +4,3 @@ no-missing-haddock-file-warning
hurd.diff
buildpath-abi-stability.patch
reproducible-tmp-names
-cabal-show-detail-direct.patch
-sh4-platform-detection-support.patch
-sparc64-initial-platform-support.patch
diff --git a/p/ghc/debian/patches/sh4-platform-detection-support.patch b/p/ghc/debian/patches/sh4-platform-detection-support.patch
deleted file mode 100644
index 5c0aa20..0000000
--- a/p/ghc/debian/patches/sh4-platform-detection-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Add platform detection support for Renesas SH4
- This patch adds platform detection support for Renesas
- SH4 (SuperH) which is called "sh4" in Debian.
- .
-
-Index: ghc/aclocal.m4
-===================================================================
---- ghc.orig/aclocal.m4 2015-12-06 13:59:33.338092013 +0100
-+++ ghc/aclocal.m4 2015-12-06 13:59:33.334091395 +0100
-@@ -209,7 +209,7 @@
- mipsel)
- test -z "[$]2" || eval "[$]2=ArchMipsel"
- ;;
-- hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sparc64|vax)
-+ hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sh4|sparc64|vax)
- test -z "[$]2" || eval "[$]2=ArchUnknown"
- ;;
- *)
-@@ -1979,6 +1979,9 @@
- s390*)
- $2="s390"
- ;;
-+ sh4)
-+ $2="sh4"
-+ ;;
- sparc64*)
- $2="sparc64"
- ;;
diff --git a/p/ghc/debian/patches/sparc64-initial-platform-support.patch b/p/ghc/debian/patches/sparc64-initial-platform-support.patch
deleted file mode 100644
index d4e118e..0000000
--- a/p/ghc/debian/patches/sparc64-initial-platform-support.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-Description: Add initial platform support for sparc64
- This patch adds initial platform support for sparc64 by mapping
- sparc64 to "ArchSPARC64" instead of "ArchUnknown" in aclocal.m4.
- Additionally, it adds "ArchSPARC64" to the list of known platforms
- in compiler/utils/Platform.hs and various code sections of the
- compiler code where the architecture is checked. Finally, it patches
- compiler/main/DriverPipeline.hs to explicitly pass "-no-relax" to gcc.
- See upstream ticket #11211 and Debian bug #807777.
- .
-
-Index: ghc/aclocal.m4
-===================================================================
---- ghc.orig/aclocal.m4 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/aclocal.m4 2015-12-14 09:08:17.750064755 +0100
-@@ -193,6 +193,10 @@
- sparc)
- test -z "[$]2" || eval "[$]2=ArchSPARC"
- ;;
-+ sparc64)
-+ test -z "[$]2" || eval "[$]2=ArchSPARC64"
-+ ;;
-+
- arm)
- GET_ARM_ISA()
- test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
-@@ -209,7 +213,7 @@
- mipsel)
- test -z "[$]2" || eval "[$]2=ArchMipsel"
- ;;
-- hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sh4|sparc64|vax)
-+ hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sh4|vax)
- test -z "[$]2" || eval "[$]2=ArchUnknown"
- ;;
- *)
-Index: ghc/compiler/main/DriverPipeline.hs
-===================================================================
---- ghc.orig/compiler/main/DriverPipeline.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/main/DriverPipeline.hs 2015-12-14 09:08:17.750064755 +0100
-@@ -2208,6 +2208,7 @@
- -- -r and --relax are incompatible for ld, so
- -- disable --relax explicitly.
- ++ (if platformArch (targetPlatform dflags) == ArchSPARC
-+ || platformArch (targetPlatform dflags) == ArchSPARC64
- && ldIsGnuLd
- then [SysTools.Option "-Wl,-no-relax"]
- else [])
-Index: ghc/compiler/nativeGen/AsmCodeGen.hs
-===================================================================
---- ghc.orig/compiler/nativeGen/AsmCodeGen.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/nativeGen/AsmCodeGen.hs 2015-12-14 09:08:17.754064808 +0100
-@@ -171,6 +171,7 @@
- ArchX86_64 -> nCG' (x86_64NcgImpl dflags)
- ArchPPC -> nCG' (ppcNcgImpl dflags)
- ArchSPARC -> nCG' (sparcNcgImpl dflags)
-+ ArchSPARC64 -> panic "nativeCodeGen: No NCG for SPARC64"
- ArchARM {} -> panic "nativeCodeGen: No NCG for ARM"
- ArchARM64 -> panic "nativeCodeGen: No NCG for ARM64"
- ArchPPC_64 -> panic "nativeCodeGen: No NCG for PPC 64"
-Index: ghc/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs
-===================================================================
---- ghc.orig/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs 2015-12-14 09:08:17.754064808 +0100
-@@ -111,6 +111,7 @@
- ArchX86_64 -> 5
- ArchPPC -> 16
- ArchSPARC -> 14
-+ ArchSPARC64 -> panic "trivColorable ArchSPARC64"
- ArchPPC_64 -> panic "trivColorable ArchPPC_64"
- ArchARM _ _ _ -> panic "trivColorable ArchARM"
- ArchARM64 -> panic "trivColorable ArchARM64"
-@@ -136,6 +137,7 @@
- ArchX86_64 -> 0
- ArchPPC -> 0
- ArchSPARC -> 22
-+ ArchSPARC64 -> panic "trivColorable ArchSPARC64"
- ArchPPC_64 -> panic "trivColorable ArchPPC_64"
- ArchARM _ _ _ -> panic "trivColorable ArchARM"
- ArchARM64 -> panic "trivColorable ArchARM64"
-@@ -161,6 +163,7 @@
- ArchX86_64 -> 0
- ArchPPC -> 26
- ArchSPARC -> 11
-+ ArchSPARC64 -> panic "trivColorable ArchSPARC64"
- ArchPPC_64 -> panic "trivColorable ArchPPC_64"
- ArchARM _ _ _ -> panic "trivColorable ArchARM"
- ArchARM64 -> panic "trivColorable ArchARM64"
-@@ -186,6 +189,7 @@
- ArchX86_64 -> 10
- ArchPPC -> 0
- ArchSPARC -> 0
-+ ArchSPARC64 -> panic "trivColorable ArchSPARC64"
- ArchPPC_64 -> panic "trivColorable ArchPPC_64"
- ArchARM _ _ _ -> panic "trivColorable ArchARM"
- ArchARM64 -> panic "trivColorable ArchARM64"
-Index: ghc/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs
-===================================================================
---- ghc.orig/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs 2015-12-14 09:08:17.754064808 +0100
-@@ -74,6 +74,7 @@
- ArchX86_64 -> X86.Instr.maxSpillSlots dflags
- ArchPPC -> PPC.Instr.maxSpillSlots dflags
- ArchSPARC -> SPARC.Instr.maxSpillSlots dflags
-+ ArchSPARC64 -> panic "maxSpillSlots ArchSPARC64"
- ArchARM _ _ _ -> panic "maxSpillSlots ArchARM"
- ArchARM64 -> panic "maxSpillSlots ArchARM64"
- ArchPPC_64 -> panic "maxSpillSlots ArchPPC_64"
-Index: ghc/compiler/nativeGen/RegAlloc/Linear/Main.hs
-===================================================================
---- ghc.orig/compiler/nativeGen/RegAlloc/Linear/Main.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/nativeGen/RegAlloc/Linear/Main.hs 2015-12-14 09:08:17.754064808 +0100
-@@ -209,6 +209,7 @@
- ArchX86_64 -> go $ (frInitFreeRegs platform :: X86_64.FreeRegs)
- ArchSPARC -> go $ (frInitFreeRegs platform :: SPARC.FreeRegs)
- ArchPPC -> go $ (frInitFreeRegs platform :: PPC.FreeRegs)
-+ ArchSPARC64 -> panic "linearRegAlloc ArchSPARC64"
- ArchARM _ _ _ -> panic "linearRegAlloc ArchARM"
- ArchARM64 -> panic "linearRegAlloc ArchARM64"
- ArchPPC_64 -> panic "linearRegAlloc ArchPPC_64"
-Index: ghc/compiler/nativeGen/TargetReg.hs
-===================================================================
---- ghc.orig/compiler/nativeGen/TargetReg.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/nativeGen/TargetReg.hs 2015-12-14 09:08:17.754064808 +0100
-@@ -44,6 +44,7 @@
- ArchX86_64 -> X86.virtualRegSqueeze
- ArchPPC -> PPC.virtualRegSqueeze
- ArchSPARC -> SPARC.virtualRegSqueeze
-+ ArchSPARC64 -> panic "targetVirtualRegSqueeze ArchSPARC64"
- ArchPPC_64 -> panic "targetVirtualRegSqueeze ArchPPC_64"
- ArchARM _ _ _ -> panic "targetVirtualRegSqueeze ArchARM"
- ArchARM64 -> panic "targetVirtualRegSqueeze ArchARM64"
-@@ -61,6 +62,7 @@
- ArchX86_64 -> X86.realRegSqueeze
- ArchPPC -> PPC.realRegSqueeze
- ArchSPARC -> SPARC.realRegSqueeze
-+ ArchSPARC64 -> panic "targetRealRegSqueeze ArchSPARC64"
- ArchPPC_64 -> panic "targetRealRegSqueeze ArchPPC_64"
- ArchARM _ _ _ -> panic "targetRealRegSqueeze ArchARM"
- ArchARM64 -> panic "targetRealRegSqueeze ArchARM64"
-@@ -77,6 +79,7 @@
- ArchX86_64 -> X86.classOfRealReg platform
- ArchPPC -> PPC.classOfRealReg
- ArchSPARC -> SPARC.classOfRealReg
-+ ArchSPARC64 -> panic "targetClassOfRealReg ArchSPARC64"
- ArchPPC_64 -> panic "targetClassOfRealReg ArchPPC_64"
- ArchARM _ _ _ -> panic "targetClassOfRealReg ArchARM"
- ArchARM64 -> panic "targetClassOfRealReg ArchARM64"
-@@ -93,6 +96,7 @@
- ArchX86_64 -> X86.mkVirtualReg
- ArchPPC -> PPC.mkVirtualReg
- ArchSPARC -> SPARC.mkVirtualReg
-+ ArchSPARC64 -> panic "targetMkVirtualReg ArchSPARC64"
- ArchPPC_64 -> panic "targetMkVirtualReg ArchPPC_64"
- ArchARM _ _ _ -> panic "targetMkVirtualReg ArchARM"
- ArchARM64 -> panic "targetMkVirtualReg ArchARM64"
-@@ -109,6 +113,7 @@
- ArchX86_64 -> X86.regDotColor platform
- ArchPPC -> PPC.regDotColor
- ArchSPARC -> SPARC.regDotColor
-+ ArchSPARC64 -> panic "targetRegDotColor ArchSPARC64"
- ArchPPC_64 -> panic "targetRegDotColor ArchPPC_64"
- ArchARM _ _ _ -> panic "targetRegDotColor ArchARM"
- ArchARM64 -> panic "targetRegDotColor ArchARM64"
-Index: ghc/compiler/utils/Platform.hs
-===================================================================
---- ghc.orig/compiler/utils/Platform.hs 2015-12-14 09:08:17.758064860 +0100
-+++ ghc/compiler/utils/Platform.hs 2015-12-14 09:08:17.758064860 +0100
-@@ -48,6 +48,7 @@
- | ArchPPC
- | ArchPPC_64
- | ArchSPARC
-+ | ArchSPARC64
- | ArchARM
- { armISA :: ArmISA
- , armISAExt :: [ArmISAExt]
diff --git a/p/ghc/debian/patches/use-debian-gen_contents_index b/p/ghc/debian/patches/use-debian-gen_contents_index
index 8291f32..9a49a5b 100644
--- a/p/ghc/debian/patches/use-debian-gen_contents_index
+++ b/p/ghc/debian/patches/use-debian-gen_contents_index
@@ -1,8 +1,8 @@
-Index: ghc-7.10.1/ghc.mk
+Index: ghc/ghc.mk
===================================================================
---- ghc-7.10.1.orig/ghc.mk 2015-05-11 22:23:36.181457550 +0200
-+++ ghc-7.10.1/ghc.mk 2015-05-11 22:23:36.181457550 +0200
-@@ -772,7 +772,6 @@
+--- ghc.orig/ghc.mk 2016-01-14 16:17:38.580310120 +0100
++++ ghc/ghc.mk 2016-01-14 16:19:06.634093119 +0100
+@@ -810,7 +810,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,21 +10,21 @@ Index: ghc-7.10.1/ghc.mk
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
-@@ -881,12 +880,8 @@
- $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
- $(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
+@@ -931,12 +930,8 @@
+ $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
+ $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
-- $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries")
+- $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/libraries"
- for i in $(INSTALL_LIBRARY_DOCS); do \
-- $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)/html/libraries/"); \
+- $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \
- done
+ mkdir -p $(DESTDIR)$(docdir)/html/libraries/
- $(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/")
-- $(call INSTALL_SCRIPT,$(INSTALL_OPTS),libraries/gen_contents_index,"$(DESTDIR)$(docdir)/html/libraries/")
+ $(INSTALL_DATA) $(INSTALL_OPTS) libraries/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/"
+- $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
- for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -998,7 +993,6 @@
+ # We need to filter out the directories so install doesn't choke on them
+@@ -1051,7 +1046,6 @@
mk/project.mk \
mk/install.mk.in \
bindist.mk \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list