Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/031744802eb9921aff8751be3a013da5c2c187c6 >--------------------------------------------------------------- commit 031744802eb9921aff8751be3a013da5c2c187c6 Author: Thomas Tuegel <[email protected]> Date: Sun Feb 19 00:55:11 2012 +0000 Fix 'cabal configure --enable-{tests,benchmarks}'. 'cabal configure' was not adding optional stanza constraints when checking dependencies, causing '--enable-{tests,benchmarks}' to be silently ignored. >--------------------------------------------------------------- cabal-install/Distribution/Client/Configure.hs | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/cabal-install/Distribution/Client/Configure.hs b/cabal-install/Distribution/Client/Configure.hs index 96a98df..9ef2dc6 100644 --- a/cabal-install/Distribution/Client/Configure.hs +++ b/cabal-install/Distribution/Client/Configure.hs @@ -137,6 +137,10 @@ planLocalPackage verbosity comp configFlags configExFlags installedPkgIndex solver = fromFlag $ configSolver configExFlags + testsEnabled = fromFlagOrDefault False $ configTests configFlags + benchmarksEnabled = + fromFlagOrDefault False $ configBenchmarks configFlags + resolverParams = addPreferences @@ -155,6 +159,15 @@ planLocalPackage verbosity comp configFlags configExFlags installedPkgIndex [ PackageConstraintFlags (packageName pkg) (configConfigurationsFlags configFlags) ] + . addConstraints + -- '--enable-tests' and '--enable-benchmarks' constraints from + -- command line + [ PackageConstraintStanzas (packageName pkg) $ concat + [ if testsEnabled then [TestStanzas] else [] + , if benchmarksEnabled then [BenchStanzas] else [] + ] + ] + $ standardInstallPolicy installedPkgIndex (SourcePackageDb mempty packagePrefs) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
