Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2013-09-08 11:30:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-08-01 17:14:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-09-08 11:30:21.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 3 20:46:48 UTC 2013 - [email protected] + +- build optimized compiler (BuildFlavour = perf) +- bring back Fedora's Template Haskell patch +- add Haskell trac ticket number to glibc-locale comment + +------------------------------------------------------------------- New: ---- Cabal-fix-dynamic-exec-for-TH.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.SUwpxL/_old 2013-09-08 11:30:24.000000000 +0200 +++ /var/tmp/diff_new_pack.SUwpxL/_new 2013-09-08 11:30:24.000000000 +0200 @@ -80,8 +80,10 @@ Source: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 # PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch [email protected] - See Haskell trac #4496 and #5743; backport of our patch accepted upstream for next major release. Patch: ghc-use-system-libffi.patch -# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch [email protected] -- temporary fix for Haskell trac #7062, ghc libraries do not work with as_needed and new-dtags both enabled +# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch [email protected] - temporary fix for Haskell trac #7062, ghc libraries do not work with as_needed and new-dtags both enabled Patch1: ghc-suse-as-needed.patch +# PATCH-FIX-UPSTREAM Cabal-fix-dynamic-exec-for-TH.patch [email protected] - Fedora patch 10 +Patch2: Cabal-fix-dynamic-exec-for-TH.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -109,7 +111,7 @@ Requires: ghc-base-devel # This Requires fixes an issue in ghc's runtime system (rts) when # locale files are missing. RTS loops and a memory leak eventually -# exhausts all memory and the program crashes. +# exhausts all memory and the program crashes. See Haskell trac #7695. Requires: glibc-locale Requires(post): update-alternatives Requires(postun): update-alternatives @@ -177,6 +179,7 @@ %patch -p1 -b .libffi rm -r ghc-tarballs/libffi %patch1 -p1 -b .suse +%patch2 -p1 -b .TH %build # required for patch and patch1 @@ -201,6 +204,7 @@ # http://hackage.haskell.org/trac/ghc/wiki/Platforms # cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc cat > mk/build.mk << EOF +BuildFlavour = perf GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p} %if %{defined without_haddock} HADDOCK_DOCS = NO ++++++ Cabal-fix-dynamic-exec-for-TH.patch ++++++ --- ghc-7.6.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs~ 2013-04-19 06:32:04.000000000 +0900 +++ ghc-7.6.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs 2013-06-12 11:35:39.832840754 +0900 @@ -837,6 +837,8 @@ dynamicOpts = vanillaOpts `mappend` mempty { ghcOptDynamic = toFlag True, + ghcOptHiSuffix = toFlag "dyn_hi", + ghcOptObjSuffix = toFlag "dyn_o", ghcOptExtra = ghcSharedOptions exeBi } @@ -855,9 +857,9 @@ -- 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 && + when ((withProfExe lbi || withDynExe lbi) && EnableExtension TemplateHaskell `elem` allExtensions exeBi) $ - runGhcProg exeProfOpts { ghcOptNoLink = toFlag True } + runGhcProg vanillaOpts { ghcOptNoLink = toFlag True } runGhcProg exeOpts { ghcOptOutputFile = toFlag (targetDir </> exeNameReal) } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
