Gentoo Archives: gentoo-commits

From: "Lennart Kolmodin (kolmodin)" <kolmodin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: haskell-cabal.eclass
Date: Tue, 26 Jan 2010 20:50:43
Message-Id: E1NZsMy-00027J-U6@stork.gentoo.org
1 kolmodin 10/01/26 20:50:40
2
3 Modified: haskell-cabal.eclass
4 Log:
5 haskell-cabal.eclass: Don't strip executables, let portage do it.
6
7 Revision Changes Path
8 1.18 eclass/haskell-cabal.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.18&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.18&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.17&r2=1.18
13
14 Index: haskell-cabal.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
17 retrieving revision 1.17
18 retrieving revision 1.18
19 diff -u -r1.17 -r1.18
20 --- haskell-cabal.eclass 28 Oct 2009 23:46:16 -0000 1.17
21 +++ haskell-cabal.eclass 26 Jan 2010 20:50:40 -0000 1.18
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2006 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.17 2009/10/28 23:46:16 kolmodin Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.18 2010/01/26 20:50:40 kolmodin Exp $
27 #
28 # Original authors: Andres Loeh <kosmikus@g.o>
29 # Duncan Coutts <dcoutts@g.o>
30 @@ -195,6 +195,16 @@
31 cabalconf="${cabalconf} --disable-library-for-ghci"
32 fi
33
34 + if version_is_at_least "1.4" "$(cabal-version)"; then
35 + # disable executable stripping for the executables, as portage will
36 + # strip by itself, and pre-stripping gives a QA warning.
37 + # cabal versions previous to 1.4 does not strip executables, and does
38 + # not accept the flag.
39 + # this fixes numerous bugs, amongst them;
40 + # bug #251881, bug #251882, bug #251884, bug #251886, bug #299494
41 + cabalconf="${cabalconf} --disable-executable-stripping"
42 + fi
43 +
44 if version_is_at_least "1.2.0" "$(cabal-version)"; then
45 cabalconf="${cabalconf} --docdir=/usr/share/doc/${PF}"
46 # As of Cabal 1.2, configure is quite quiet. For diagnostic purposes