Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-03-16 10:33:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-02-22 08:57:38.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-03-16
10:33:53.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Mar 8 08:56:42 UTC 2016 - mimi...@gmail.com
+
+- update Cabal to 1.22.8.0
+- refresh u_Cabal_update.patch
+* Distribution.Simple.Setup: remove job cap
+* Check all object file suffixes for recompilation
+* Move source files under 'src/'.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc.spec ++++++
--- /var/tmp/diff_new_pack.tSywtL/_old 2016-03-16 10:33:55.000000000 +0100
+++ /var/tmp/diff_new_pack.tSywtL/_new 2016-03-16 10:33:55.000000000 +0100
@@ -127,7 +127,7 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal 1.22.7.0
+%ghc_lib_subpackage Cabal 1.22.8.0
%ghc_lib_subpackage array 0.5.1.0
%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.2.0
%ghc_lib_subpackage binary 0.7.5.0
++++++ u_Cabal_update.patch ++++++
--- /var/tmp/diff_new_pack.tSywtL/_old 2016-03-16 10:33:55.000000000 +0100
+++ /var/tmp/diff_new_pack.tSywtL/_new 2016-03-16 10:33:55.000000000 +0100
@@ -1,11 +1,11 @@
-diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
-index b498ca0..bf64bd5 100644
---- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
+diff --git a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Cabal.cabal
b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
+index b498ca0..e8bfb00 100644
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Cabal.cabal
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
@@ -1,5 +1,5 @@
name: Cabal
-version: 1.22.5.0
-+version: 1.22.7.0
++version: 1.22.8.0
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
@@ -45,11 +45,29 @@
Cabal,
process,
directory,
-diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-index 444c851..270e2c3 100644
---- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+diff --git a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+index 444c851..fa6d8a8 100644
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-@@ -553,8 +553,10 @@ buildOrReplLib forRepl verbosity numJobs pkg_descr lbi
lib clbi = do
+@@ -542,19 +542,22 @@ buildOrReplLib forRepl verbosity numJobs pkg_descr lbi
lib clbi = do
+ }
+ odir = fromFlag (ghcOptObjDir vanillaCcOpts)
+ createDirectoryIfMissingVerbose verbosity True odir
+- needsRecomp <- checkNeedsRecompilation filename vanillaCcOpts
+- when needsRecomp $ do
+- runGhcProg vanillaCcOpts
+- unless forRepl $
+- whenSharedLib forceSharedLib (runGhcProg sharedCcOpts)
+- unless forRepl $ whenProfLib (runGhcProg profCcOpts)
++ let runGhcProgIfNeeded ccOpts = do
++ needsRecomp <- checkNeedsRecompilation filename ccOpts
++ when needsRecomp $ runGhcProg ccOpts
++ runGhcProgIfNeeded vanillaCcOpts
++ unless forRepl $
++ whenSharedLib forceSharedLib (runGhcProgIfNeeded sharedCcOpts)
++ unless forRepl $ whenProfLib (runGhcProgIfNeeded profCcOpts)
+ | filename <- cSources libBi]
+
-- TODO: problem here is we need the .c files built first, so we can load
them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi
-- exports.
@@ -62,7 +80,7 @@
-- link:
unless forRepl $ do
-@@ -766,7 +768,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
+@@ -766,7 +769,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
ghcOptLinkLibPath = toNubListR $ extraLibDirs exeBi,
ghcOptLinkFrameworks = toNubListR $ PD.frameworks exeBi,
ghcOptInputFiles = toNubListR
@@ -73,7 +91,7 @@
ghcOptRPaths = rpaths
}
replOpts = baseOpts {
-@@ -812,9 +816,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
+@@ -812,9 +817,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
| otherwise = doingTH && (withProfExe lbi || withDynExe lbi)
linkOpts = commonOpts `mappend`
@@ -86,9 +104,9 @@
-- Build static/dynamic object files for TH, if needed.
when compileForTH $
-diff --git
a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
+diff --git
a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
index 095d6b8..2d09292 100644
---- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
@@ -84,14 +84,16 @@ import Language.Haskell.Extension
@@ -146,9 +164,21 @@
renderPureArgs :: Version -> Compiler -> HaddockArgs -> [String]
renderPureArgs version comp args = concat
-diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Version.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Version.hs
+diff --git
a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs
+index b87b567..abda3c7 100644
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs
++++ b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Setup.hs
+@@ -2099,7 +2099,6 @@ optionNumJobs get set =
+ _ -> case reads s of
+ [(n, "")]
+ | n < 1 -> Left "The number of jobs should be 1 or more."
+- | n > 64 -> Left "You probably don't want that many jobs."
+ | otherwise -> Right (Just n)
+ _ -> Left "The jobs value should be a number or
'$ncpus'"
+
+diff --git a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Version.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Version.hs
index 1123749..e5c2e28 100644
---- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Version.hs
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Version.hs
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Version.hs
@@ -3,7 +3,25 @@
#if __GLASGOW_HASKELL__ < 707
@@ -192,11 +222,16 @@
{-# DEPRECATED AnyVersion "Use 'anyVersion', 'foldVersionRange' or
'asVersionIntervals'" #-}
{-# DEPRECATED ThisVersion "use 'thisVersion', 'foldVersionRange' or
'asVersionIntervals'" #-}
-diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/changelog
b/ghc-7.10.3/libraries/Cabal/Cabal/changelog
-index f5fb8ff..57b3450 100644
---- a/ghc-7.10.3.old/libraries/Cabal/Cabal/changelog
+diff --git a/ghc-7.10.3.orig/libraries/Cabal/Cabal/changelog
b/ghc-7.10.3/libraries/Cabal/Cabal/changelog
+index f5fb8ff..45c15f9 100644
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/changelog
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/changelog
-@@ -1,3 +1,12 @@
+@@ -1,3 +1,17 @@
++1.22.8.0 Ryan Thomas <r...@ryant.org> March 2016
++ * Distribution.Simple.Setup: remove job cap. Fixes #3191.
++ * Check all object file suffixes for recompilation. Fixes #3128.
++ * Move source files under 'src/'. Fixes #3003.
++
+1.22.7.0 Ryan Thomas <r...@ryant.org> January 2016
+ * Backport #3012 to the 1.22 branch
+ * Cabal.cabal: change build-type to Simple
