| 1 |
slyfox 14/05/22 16:35:11 |
| 2 |
|
| 3 |
Modified: ChangeLog haskell-cabal.eclass |
| 4 |
Log: |
| 5 |
cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists, then to PN |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1264 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1264&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1264&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1263&r2=1.1264 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1263 |
| 18 |
retrieving revision 1.1264 |
| 19 |
diff -u -r1.1263 -r1.1264 |
| 20 |
--- ChangeLog 22 May 2014 16:30:59 -0000 1.1263 |
| 21 |
+++ ChangeLog 22 May 2014 16:35:11 -0000 1.1264 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1263 2014/05/22 16:30:59 slyfox Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1264 2014/05/22 16:35:11 slyfox Exp $ |
| 27 |
+ |
| 28 |
+ 22 May 2014; Sergei Trofimovich <slyfox@g.o> haskell-cabal.eclass: |
| 29 |
+ cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists, |
| 30 |
+ then to PN |
| 31 |
|
| 32 |
22 May 2014; Sergei Trofimovich <slyfox@g.o> darcs.eclass: |
| 33 |
store darcs cache in DISTDIR |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.44 eclass/haskell-cabal.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.44&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.44&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.43&r2=1.44 |
| 42 |
|
| 43 |
Index: haskell-cabal.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v |
| 46 |
retrieving revision 1.43 |
| 47 |
retrieving revision 1.44 |
| 48 |
diff -u -r1.43 -r1.44 |
| 49 |
--- haskell-cabal.eclass 11 Feb 2014 19:00:06 -0000 1.43 |
| 50 |
+++ haskell-cabal.eclass 22 May 2014 16:35:11 -0000 1.44 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.43 2014/02/11 19:00:06 slyfox Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.44 2014/05/22 16:35:11 slyfox Exp $ |
| 56 |
|
| 57 |
# @ECLASS: haskell-cabal.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -180,10 +180,11 @@ |
| 60 |
|
| 61 |
make_setup() { |
| 62 |
set -- -package "${cabalpackage}" --make "${setupmodule}" \ |
| 63 |
+ ${HCFLAGS} \ |
| 64 |
${GHC_BOOTSTRAP_FLAGS} \ |
| 65 |
"$@" \ |
| 66 |
-o setup |
| 67 |
- echo $(ghc-getghc) ${HCFLAGS} "$@" |
| 68 |
+ echo $(ghc-getghc) "$@" |
| 69 |
$(ghc-getghc) "$@" |
| 70 |
} |
| 71 |
if $(ghc-supports-shared-libraries); then |
| 72 |
@@ -209,18 +210,14 @@ |
| 73 |
} |
| 74 |
|
| 75 |
cabal-mksetup() { |
| 76 |
- local setupdir |
| 77 |
+ local setupdir=${1:-${S}} |
| 78 |
+ local setup_src=${setupdir}/Setup.hs |
| 79 |
|
| 80 |
- if [[ -n $1 ]]; then |
| 81 |
- setupdir=$1 |
| 82 |
- else |
| 83 |
- setupdir=${S} |
| 84 |
- fi |
| 85 |
- |
| 86 |
- rm -f "${setupdir}"/Setup.{lhs,hs} |
| 87 |
+ rm -vf "${setupdir}"/Setup.{lhs,hs} |
| 88 |
+ elog "Creating 'Setup.hs' for 'Simple' build type." |
| 89 |
|
| 90 |
echo 'import Distribution.Simple; main = defaultMainWithHooks defaultUserHooks' \ |
| 91 |
- > $setupdir/Setup.hs || die "failed to create default Setup.hs" |
| 92 |
+ > "${setup_src}" || die "failed to create default Setup.hs" |
| 93 |
} |
| 94 |
|
| 95 |
cabal-hscolour() { |
| 96 |
@@ -252,10 +249,12 @@ |
| 97 |
} |
| 98 |
|
| 99 |
cabal-show-brokens() { |
| 100 |
+ elog "ghc-pkg check: 'checking for other broken packages:'" |
| 101 |
# pretty-printer |
| 102 |
$(ghc-getghcpkg) check 2>&1 \ |
| 103 |
| egrep -v '^Warning: haddock-(html|interfaces): ' \ |
| 104 |
- | egrep -v '^Warning: include-dirs: ' |
| 105 |
+ | egrep -v '^Warning: include-dirs: ' \ |
| 106 |
+ | head -n 20 |
| 107 |
|
| 108 |
cabal-die-if-nonempty 'broken' \ |
| 109 |
$($(ghc-getghcpkg) check --simple-output) |
| 110 |
@@ -311,8 +310,10 @@ |
| 111 |
if ghc-supports-parallel-make; then |
| 112 |
local max_jobs=$(makeopts_jobs) |
| 113 |
|
| 114 |
- # limit to sort-of-sane value (same as Cabal) |
| 115 |
- [[ ${max_jobs} -gt 64 ]] && max_jobs=64 |
| 116 |
+ # limit to very small value, as parallelism |
| 117 |
+ # helps slightly, but makes things severely worse |
| 118 |
+ # when amount of threads is Very Large. |
| 119 |
+ [[ ${max_jobs} -gt 4 ]] && max_jobs=4 |
| 120 |
|
| 121 |
cabalconf+=(--ghc-option=-j"$max_jobs") |
| 122 |
fi |
| 123 |
@@ -619,7 +620,8 @@ |
| 124 |
#} |
| 125 |
# |
| 126 |
cabal_chdeps() { |
| 127 |
- local cf=${CABAL_FILE:-${S}/${PN}.cabal} |
| 128 |
+ local cabal_fn=${MY_PN:-${PN}}.cabal |
| 129 |
+ local cf=${CABAL_FILE:-${S}/${cabal_fn}} |
| 130 |
local from_ss # ss - substring |
| 131 |
local to_ss |
| 132 |
local orig_c # c - contents |
Archives