diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-14 00:46:01 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-14 00:46:01 -0700 |
| commit | 4eb56e1b3a80c84f2dddf2692310369dc9cbd31a (patch) | |
| tree | b31de2992989d616383f6552ba5d23b75701ef04 /extra/cabal-install | |
| parent | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff) | |
Sun Oct 14 00:45:38 PDT 2012
Diffstat (limited to 'extra/cabal-install')
| -rw-r--r-- | extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch | 27 | ||||
| -rw-r--r-- | extra/cabal-install/PKGBUILD | 10 |
2 files changed, 34 insertions, 3 deletions
diff --git a/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch b/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch new file mode 100644 index 000000000..f67e34677 --- /dev/null +++ b/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch @@ -0,0 +1,27 @@ +From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Sat, 13 Oct 2012 20:37:09 -0700 +Subject: [PATCH] disable setting jobs due to cabal 1.16.0 bug shipped with + ghc 7.6.1 + +--- + Distribution/Client/Config.hs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Distribution/Client/Config.hs b/Distribution/Client/Config.hs +index 93e5a52..ecbc6f7 100644 +--- a/Distribution/Client/Config.hs ++++ b/Distribution/Client/Config.hs +@@ -202,8 +202,7 @@ initialSavedConfig = do + }, + savedInstallFlags = mempty { + installSummaryFile = [toPathTemplate (logsDir </> "build.log")], +- installBuildReports= toFlag AnonymousReports, +- installNumJobs = toFlag (Just numberOfProcessors) ++ installBuildReports= toFlag AnonymousReports + } + } + +-- +1.7.12.3 + diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index 5ce042013..13bbc4a74 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -4,19 +4,23 @@ pkgname=cabal-install pkgver=1.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3') depends=('ghc' 'gmp' 'zlib') -source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz") -md5sums=('da046116eee7664158411fa9e2cf6b14') +source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz" + '0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch') +md5sums=('da046116eee7664158411fa9e2cf6b14' + 'd4705a398588efe6dbbcf6f4c3185a7d') build() { cd cabal-install-${pkgver} + patch -Np1 -i ${srcdir}/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch + runhaskell Setup configure \ --enable-shared \ --enable-split-objs \ |