From 7ec5a274591bb48e648f466c96da6aeeba9bfb28 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 11:31:10 +0200 Subject: [PATCH 1/7] Bump versions. --- Cabal/Cabal.cabal | 2 +- cabal-install/cabal-install.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 55025056529..55e05c4a337 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,5 +1,5 @@ Name: Cabal -Version: 1.15.0 +Version: 1.15.1 Copyright: 2003-2006, Isaac Jones 2005-2011, Duncan Coutts License: BSD3 diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index ff8571808bd..bea38e5ebbc 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -1,5 +1,5 @@ Name: cabal-install -Version: 0.15.0 +Version: 0.15.1 Synopsis: The command-line interface for Cabal and Hackage. Description: The \'cabal\' command-line program simplifies the process of managing From b974e97ce2a69235d9d73c94ba67ac92038c3b90 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 11:36:51 +0200 Subject: [PATCH 2/7] Relax dependency on containers. --- cabal-install/cabal-install.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index bea38e5ebbc..22d547451ac 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -122,7 +122,7 @@ Executable cabal directory >= 1 && < 1.2, pretty >= 1 && < 1.2, random >= 1 && < 1.1, - containers >= 0.1 && < 0.5, + containers >= 0.1 && < 0.6, array >= 0.1 && < 0.5, old-time >= 1 && < 1.2 From 90d99652a79a7e4594e9f1fe649ebba87fff41c8 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Thu, 12 Jul 2012 10:24:21 +0100 Subject: [PATCH 3/7] Bump version to 1.16.0 --- Cabal/Cabal.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 55e05c4a337..14f885e31c6 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,5 +1,5 @@ Name: Cabal -Version: 1.15.1 +Version: 1.16.0 Copyright: 2003-2006, Isaac Jones 2005-2011, Duncan Coutts License: BSD3 From 98d140cb6ad9d32627c7cb3f1750d155d020a7f4 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Thu, 12 Jul 2012 10:28:28 +0100 Subject: [PATCH 4/7] Add GHC build files to .gitignore. --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 76c34bb121b..d4ced7a1ac4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,10 @@ cabal-dev/ Cabal/dist/ cabal-install/dist/ .hpc/ + +# GHC build + +Cabal/GNUmakefile +Cabal/dist-boot/ +Cabal/dist-install/ +Cabal/ghc.mk From 7e7ca46dd33ab53e84d41f88893519656ecaf5d1 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Thu, 12 Jul 2012 10:28:47 +0100 Subject: [PATCH 5/7] Update unix dependency. --- Cabal/Cabal.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 14f885e31c6..71da092ee06 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -51,7 +51,7 @@ Library pretty >= 1 && < 1.2 if !os(windows) - Build-Depends: unix >= 2.0 && < 2.6 + Build-Depends: unix >= 2.0 && < 2.7 ghc-options: -Wall -fno-ignore-asserts if impl(ghc >= 6.8) From a091bda0713aa8053f8ad08f463ce5492297aafc Mon Sep 17 00:00:00 2001 From: Johan Tibell Date: Mon, 9 Jul 2012 12:08:46 -0700 Subject: [PATCH 6/7] Fix bug where ghc-options would be ignored in profiling/shared builds --- Cabal/Distribution/Simple/GHC.hs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs index e1151028a12..87b2c5aff87 100644 --- a/Cabal/Distribution/Simple/GHC.hs +++ b/Cabal/Distribution/Simple/GHC.hs @@ -631,20 +631,20 @@ buildLib verbosity pkg_descr lbi lib clbi = do createDirectoryIfMissingVerbose verbosity True libTargetDir -- TODO: do we need to put hs-boot files into place for mutually recurive modules? let baseOpts = componentGhcOptions verbosity lbi libBi clbi libTargetDir - vanillaOpts = baseOpts { + vanillaOpts = baseOpts `mappend` mempty { ghcOptMode = toFlag GhcModeMake, ghcOptPackageName = toFlag pkgid, ghcOptInputModules = libModules lib } - profOpts = vanillaOpts { + profOpts = vanillaOpts `mappend` mempty { ghcOptProfilingMode = toFlag True, ghcOptHiSuffix = toFlag "p_hi", ghcOptObjSuffix = toFlag "p_o", ghcOptExtra = ghcProfOptions libBi } - sharedOpts = vanillaOpts { + sharedOpts = vanillaOpts `mappend` mempty { ghcOptDynamic = toFlag True, ghcOptFPic = toFlag True, ghcOptHiSuffix = toFlag "dyn_hi", @@ -662,10 +662,10 @@ buildLib verbosity pkg_descr lbi lib clbi = do info verbosity "Building C Sources..." sequence_ [ do let vanillaCcOpts = (componentCcGhcOptions verbosity lbi - libBi clbi pref filename) { + libBi clbi pref filename) `mappend` mempty { ghcOptProfilingMode = toFlag (withProfLib lbi) } - sharedCcOpts = vanillaOpts { + sharedCcOpts = vanillaOpts `mappend` mempty { ghcOptFPic = toFlag True, ghcOptDynamic = toFlag True, ghcOptObjSuffix = toFlag "dyn_o" @@ -812,7 +812,7 @@ buildExe verbosity _pkg_descr lbi info verbosity "Building C Sources." sequence_ [ do let opts = (componentCcGhcOptions verbosity lbi exeBi clbi - exeDir filename) { + exeDir filename) `mappend` mempty { ghcOptDynamic = toFlag (withDynExe lbi), ghcOptProfilingMode = toFlag (withProfExe lbi) } @@ -824,7 +824,8 @@ buildExe verbosity _pkg_descr lbi srcMainFile <- findFile (exeDir : hsSourceDirs exeBi) modPath let cObjs = map (`replaceExtension` objExtension) (cSources exeBi) - let vanillaOpts = (componentGhcOptions verbosity lbi exeBi clbi exeDir) { + let vanillaOpts = (componentGhcOptions verbosity lbi exeBi clbi exeDir) + `mappend` mempty { ghcOptMode = toFlag GhcModeMake, ghcOptInputFiles = [exeDir x | x <- cObjs] ++ [srcMainFile], @@ -834,7 +835,7 @@ buildExe verbosity _pkg_descr lbi ghcOptLinkFrameworks = PD.frameworks exeBi } - dynamicOpts = vanillaOpts { + dynamicOpts = vanillaOpts `mappend` mempty { ghcOptDynamic = toFlag True, ghcOptExtra = ghcSharedOptions exeBi } @@ -842,7 +843,7 @@ buildExe verbosity _pkg_descr lbi exeOpts | withDynExe lbi = dynamicOpts | otherwise = vanillaOpts - exeProfOpts = exeOpts { + exeProfOpts = exeOpts `mappend` mempty { ghcOptProfilingMode = toFlag True, ghcOptHiSuffix = toFlag "p_hi", ghcOptObjSuffix = toFlag "p_o", @@ -909,7 +910,8 @@ libAbiHash verbosity pkg_descr lbi lib clbi = do (compiler lbi) (withProfLib lbi) (libBuildInfo lib) let ghcArgs = - (componentGhcOptions verbosity lbi libBi clbi (buildDir lbi)) { + (componentGhcOptions verbosity lbi libBi clbi (buildDir lbi)) + `mappend` mempty { ghcOptMode = toFlag GhcModeAbiHash, ghcOptPackageName = toFlag (packageId pkg_descr), ghcOptInputModules = exposedModules lib From 6ca9fb3beccce30e1a67b8391a13e8acebd8a679 Mon Sep 17 00:00:00 2001 From: Johan Tibell Date: Sat, 11 Aug 2012 08:59:53 -0700 Subject: [PATCH 7/7] Update bootstrap.sh to match platform 2012.2.0.0 Contributed by Tuncer Ayaz. --- cabal-install/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index f7a439c6a8d..0a7e089d629 100644 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -50,10 +50,10 @@ PREFIX=${PREFIX:-${DEFAULT_PREFIX}} PARSEC_VER="3.1.2"; PARSEC_VER_REGEXP="[23]\." # == 2.* || == 3.* DEEPSEQ_VER="1.3.0.0"; DEEPSEQ_VER_REGEXP="1\.[1-9]\." # >= 1.1 && < 2 TEXT_VER="0.11.2.0"; TEXT_VER_REGEXP="0\.([2-9]|(1[0-1]))\." # >= 0.2 && < 0.12 -NETWORK_VER="2.3.0.11"; NETWORK_VER_REGEXP="2\." # == 2.* +NETWORK_VER="2.3.0.13"; NETWORK_VER_REGEXP="2\." # == 2.* CABAL_VER="1.14.0"; CABAL_VER_REGEXP="1\.(13\.3|14\.)" # >= 1.13.3 && < 1.15 TRANS_VER="0.3.0.0"; TRANS_VER_REGEXP="0\.[23]\." # >= 0.2.* && < 0.4.* -MTL_VER="2.1"; MTL_VER_REGEXP="[12]\." # == 1.* || == 2.* +MTL_VER="2.1.1"; MTL_VER_REGEXP="[12]\." # == 1.* || == 2.* HTTP_VER="4000.2.3"; HTTP_VER_REGEXP="4000\.[012]\." # == 4000.0.* || 4000.1.* || 4000.2.* ZLIB_VER="0.5.3.3"; ZLIB_VER_REGEXP="0\.[45]\." # == 0.4.* || == 0.5.* TIME_VER="1.4" TIME_VER_REGEXP="1\.[1234]\.?" # >= 1.1 && < 1.5