From 3f80e38a43b3cfb328490259c15418ab51c774c1 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 11 Feb 2014 22:06:01 +0900
Subject: tools: import spec files of all packages needed to build pandoc

---
 .../ghc/Cabal-fix-dynamic-exec-for-TH.patch        | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tools/bootstrap/ghc/Cabal-fix-dynamic-exec-for-TH.patch

(limited to 'tools/bootstrap/ghc/Cabal-fix-dynamic-exec-for-TH.patch')

diff --git a/tools/bootstrap/ghc/Cabal-fix-dynamic-exec-for-TH.patch b/tools/bootstrap/ghc/Cabal-fix-dynamic-exec-for-TH.patch
new file mode 100644
index 0000000..5384ea7
--- /dev/null
+++ b/tools/bootstrap/ghc/Cabal-fix-dynamic-exec-for-TH.patch
@@ -0,0 +1,33 @@
+diff -u ghc-7.2.0.20110728/libraries/Cabal/cabal/Distribution/Simple/GHC.hs.orig ghc-7.2.0.20110728/libraries/Cabal/cabal/Distribution/Simple/GHC.hs
+--- ghc-7.2.0.20110728/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig	2011-07-29 02:12:09.000000000 +0900
++++ ghc-7.2.0.20110728/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs	2011-08-05 18:08:05.192042529 +0900
+@@ -778,7 +778,10 @@
+           ++ ["-L"++libDir | libDir <- extraLibDirs exeBi]
+           ++ concat [["-framework", f] | f <- PD.frameworks exeBi]
+           ++ if dynExe
+-                then ["-dynamic"]
++                then ["-dynamic",
++                      "-hisuf", "dyn_hi",
++                      "-osuf", "dyn_o"
++                     ]
+                 else []
+           ++ if profExe
+                 then ["-prof",
+@@ -787,13 +790,14 @@
+                      ] ++ ghcProfOptions exeBi
+                 else []
+ 
+-  -- For building exe's for profiling that use TH we actually
++  -- For building exe's for profiling or dynamic that use TH we actually
+   -- have to build twice, once without profiling and the again
+   -- with profiling. This is because the code that TH needs to
+   -- run at compile time needs to be the vanilla ABI so it can
+   -- be loaded up and run by the compiler.
+-  when (withProfExe lbi && EnableExtension TemplateHaskell `elem` allExtensions exeBi)
+-     (runGhcProg (binArgs False (withDynExe lbi) False))
++  when ((withProfExe lbi || withDynExe lbi) &&
++        EnableExtension TemplateHaskell `elem` allExtensions exeBi)
++     (runGhcProg (binArgs False False False))
+ 
+   runGhcProg (binArgs True (withDynExe lbi) (withProfExe lbi))
+ 
-- 
cgit