[Pkg-haskell-commits] darcs: ghc: Replace patches/Fix-documentation-build-failure-without-GHCi.patch by the equivalent patch from GHC HEAD (./patches/TcSplice-no-GHCi-fix)
Joachim Breitner
mail at joachim-breitner.de
Mon Dec 8 19:05:50 UTC 2014
Mon Dec 8 17:50:10 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Replace patches/Fix-documentation-build-failure-without-GHCi.patch by the equivalent patch from GHC HEAD (./patches/TcSplice-no-GHCi-fix)
M ./changelog +2
R ./patches/Fix-documentation-build-failure-without-GHCi.patch
A ./patches/TcSplice-no-GHCi-fix
M ./patches/series -1 +1
Mon Dec 8 17:50:10 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Replace patches/Fix-documentation-build-failure-without-GHCi.patch by the equivalent patch from GHC HEAD (./patches/TcSplice-no-GHCi-fix)
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2014-12-08 19:05:50.515627469 +0000
+++ new-ghc/changelog 2014-12-08 19:05:50.543627465 +0000
@@ -4,6 +4,8 @@
- always_build_arm_spinlocks.patch
- dll-split-fix.patch
- linker-detection-fix
+ * Replace patches/Fix-documentation-build-failure-without-GHCi.patch by the
+ equivalent patch from GHC HEAD (./patches/TcSplice-no-GHCi-fix)
-- Joachim Breitner <nomeata at debian.org> Mon, 08 Dec 2014 18:46:19 +0100
diff -rN -u old-ghc/patches/Fix-documentation-build-failure-without-GHCi.patch new-ghc/patches/Fix-documentation-build-failure-without-GHCi.patch
--- old-ghc/patches/Fix-documentation-build-failure-without-GHCi.patch 2014-12-08 19:05:50.515627469 +0000
+++ new-ghc/patches/Fix-documentation-build-failure-without-GHCi.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-From 7d7ef32f9c310b1f666607d05fa4fd2680c02420 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson at debian.org>
-Date: Fri, 11 Apr 2014 21:07:06 +0100
-Subject: [PATCH] Fix documentation build failure without GHCi
-
-tcTopSpliceExpr, runMetaE, runMetaP, runMetaT, and runMetaD are only
-exported by TcSplice.lhs if GHCi is available, so TcSplice.lhs-boot
-should behave likewise to stop Haddock failing.
-
-Fixes #8988
-
-Signed-off-by: Colin Watson <cjwatson at debian.org>
----
- compiler/typecheck/TcSplice.lhs-boot | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/compiler/typecheck/TcSplice.lhs-boot b/compiler/typecheck/TcSplice.lhs-boot
-index c496aed..6cd8183 100644
---- a/compiler/typecheck/TcSplice.lhs-boot
-+++ b/compiler/typecheck/TcSplice.lhs-boot
-@@ -26,7 +26,9 @@ tcTypedBracket :: HsBracket Name
- -> TcRhoType
- -> TcM (HsExpr TcId)
-
-+#ifdef GHCI
- tcTopSpliceExpr :: Bool -> TcM (LHsExpr Id) -> TcM (LHsExpr Id)
-+#endif
-
- runQuasiQuoteDecl :: HsQuasiQuote RdrName -> TcM [LHsDecl RdrName]
- runQuasiQuoteExpr :: HsQuasiQuote RdrName -> TcM (LHsExpr RdrName)
-@@ -34,12 +36,12 @@ runQuasiQuoteType :: HsQuasiQuote RdrName -> TcM (LHsType RdrName)
- runQuasiQuotePat :: HsQuasiQuote RdrName -> TcM (LPat RdrName)
- runAnnotation :: CoreAnnTarget -> LHsExpr Name -> TcM Annotation
-
-+#ifdef GHCI
- runMetaE :: LHsExpr Id -> TcM (LHsExpr RdrName)
- runMetaP :: LHsExpr Id -> TcM (LPat RdrName)
- runMetaT :: LHsExpr Id -> TcM (LHsType RdrName)
- runMetaD :: LHsExpr Id -> TcM [LHsDecl RdrName]
-
--#ifdef GHCI
- lookupThName_maybe :: TH.Name -> TcM (Maybe Name)
- runQuasi :: TH.Q a -> TcM a
- #endif
---
-1.9.1
-
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series 2014-12-08 19:05:50.515627469 +0000
+++ new-ghc/patches/series 2014-12-08 19:05:50.543627465 +0000
@@ -2,9 +2,9 @@
ARM-VFPv3D16
no-missing-haddock-file-warning
haddock-hardcode-ghc-paths
-Fix-documentation-build-failure-without-GHCi.patch
arm64.patch
mips-support.patch
always_build_arm_spinlocks.patch
linker-detection-fix
dll-split-fix.patch
+TcSplice-no-GHCi-fix
diff -rN -u old-ghc/patches/TcSplice-no-GHCi-fix new-ghc/patches/TcSplice-no-GHCi-fix
--- old-ghc/patches/TcSplice-no-GHCi-fix 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/TcSplice-no-GHCi-fix 2014-12-08 19:05:50.531627470 +0000
@@ -0,0 +1,69 @@
+From d996a1bb4db84727fbf1a8e9461a032e04e544e7 Mon Sep 17 00:00:00 2001
+From: Karel Gardas <karel.gardas at centrum.cz>
+Date: Fri, 18 Jul 2014 23:54:52 -0500
+Subject: [PATCH] fix inconsistency in exported functions from
+ TcSplice.lhs/lhs-boot files when GHCI is not defined
+
+Summary:
+This patch fixes inconsistency in exported functions from TcSplice.lhs and TcSplice.lhs-boot
+files. It looks like only GHC HEAD is sensitive to it and complains about it while bootstraping
+another HEAD. At least this is what happening on Solaris/AMD64 builder machine where GHC 7.9.20140620
+is used as a boostrap compiler. The failure does not happen on another builders.
+
+Test Plan: validate
+
+Reviewers: austin
+
+Reviewed By: austin
+
+Subscribers: phaskell, simonmar, relrod, carter
+
+Differential Revision: https://phabricator.haskell.org/D74
+---
+ compiler/typecheck/TcSplice.lhs-boot | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: ghc-7.8.3.20141119/compiler/typecheck/TcSplice.lhs-boot
+===================================================================
+--- ghc-7.8.3.20141119.orig/compiler/typecheck/TcSplice.lhs-boot 2014-12-08 18:49:28.251172880 +0100
++++ ghc-7.8.3.20141119/compiler/typecheck/TcSplice.lhs-boot 2014-12-08 18:49:28.251172880 +0100
+@@ -3,7 +3,6 @@
+ import HsSyn ( HsSplice, HsBracket, HsQuasiQuote,
+ HsExpr, LHsType, LHsExpr, LPat, LHsDecl )
+ import HsExpr ( PendingRnSplice )
+-import Id ( Id )
+ import Name ( Name )
+ import RdrName ( RdrName )
+ import TcRnTypes( TcM, TcId )
+@@ -11,6 +10,7 @@
+ import Annotations ( Annotation, CoreAnnTarget )
+
+ #ifdef GHCI
++import Id ( Id )
+ import qualified Language.Haskell.TH as TH
+ #endif
+
+@@ -26,20 +26,20 @@
+ -> TcRhoType
+ -> TcM (HsExpr TcId)
+
+-tcTopSpliceExpr :: Bool -> TcM (LHsExpr Id) -> TcM (LHsExpr Id)
+-
+ runQuasiQuoteDecl :: HsQuasiQuote RdrName -> TcM [LHsDecl RdrName]
+ runQuasiQuoteExpr :: HsQuasiQuote RdrName -> TcM (LHsExpr RdrName)
+ runQuasiQuoteType :: HsQuasiQuote RdrName -> TcM (LHsType RdrName)
+ runQuasiQuotePat :: HsQuasiQuote RdrName -> TcM (LPat RdrName)
+ runAnnotation :: CoreAnnTarget -> LHsExpr Name -> TcM Annotation
+
++#ifdef GHCI
++tcTopSpliceExpr :: Bool -> TcM (LHsExpr Id) -> TcM (LHsExpr Id)
++
+ runMetaE :: LHsExpr Id -> TcM (LHsExpr RdrName)
+ runMetaP :: LHsExpr Id -> TcM (LPat RdrName)
+ runMetaT :: LHsExpr Id -> TcM (LHsType RdrName)
+ runMetaD :: LHsExpr Id -> TcM [LHsDecl RdrName]
+
+-#ifdef GHCI
+ lookupThName_maybe :: TH.Name -> TcM (Maybe Name)
+ runQuasi :: TH.Q a -> TcM a
+ #endif
More information about the Pkg-haskell-commits
mailing list