From a3e1a4bd2b3767d10438ddbd8f698bd70872c585 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Aug 2012 21:33:48 +0900 Subject: [PATCH] disable Cabal building ghci lib files --- ghc-7.4.2-Cabal-disable-ghci-libs.patch | 13 +++++++++++++ ghc.spec | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 ghc-7.4.2-Cabal-disable-ghci-libs.patch diff --git a/ghc-7.4.2-Cabal-disable-ghci-libs.patch b/ghc-7.4.2-Cabal-disable-ghci-libs.patch new file mode 100644 index 0000000..cdefe0d --- /dev/null +++ b/ghc-7.4.2-Cabal-disable-ghci-libs.patch @@ -0,0 +1,13 @@ +--- ghc-7.4.2/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs~ 2012-06-07 02:10:40.000000000 +0900 ++++ ghc-7.4.2/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs 2012-08-24 20:33:00.032123967 +0900 +@@ -313,7 +313,7 @@ + configDistPref = Flag defaultDistPref, + configVerbosity = Flag normal, + configUserInstall = Flag False, --TODO: reverse this +- configGHCiLib = Flag True, ++ configGHCiLib = Flag False, + configSplitObjs = Flag False, -- takes longer, so turn off by default + configStripExes = Flag True, + configTests = Flag False, + +Diff finished. Fri Aug 24 20:33:10 2012 diff --git a/ghc.spec b/ghc.spec index 70d797f..cdc060d 100644 --- a/ghc.spec +++ b/ghc.spec @@ -100,6 +100,8 @@ Patch9: Cabal-fix-dynamic-exec-for-TH.patch Patch10: ghc-wrapper-libffi-include.patch # latest arm hf patch Patch11: ghc-7.4-add-support-for-ARM-hard-float-ABI-fixes-5914.patch +# disable building HS*.o libs for ghci +Patch12: ghc-7.4.2-Cabal-disable-ghci-libs.patch %description GHC is a state-of-the-art, open source, compiler and interactive environment @@ -226,6 +228,8 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build autoreconf %endif +%patch12 -p1 -b .orig + %build # http://hackage.haskell.org/trac/ghc/wiki/Platforms # cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc @@ -427,6 +431,7 @@ fi - ARM StgCRun patches not longer needed - use Karel Gardas' ARM hardfloat patch committed upstream - use _smp_mflags again +- disable Cabal building ghci lib files * Thu Jul 19 2012 Fedora Release Engineering - 7.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild