summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2014-06-27 09:54:02 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2014-06-27 09:54:02 +0000
commit7dabe4c5ceec669e85af2da17566fe5419f7c2ab (patch)
tree1e23ac4c2faf86f61fcfacb58088eeb791de0220 /dev-lang/ghc
parentAdd ruby20. (diff)
downloadgentoo-2-7dabe4c5ceec669e85af2da17566fe5419f7c2ab.tar.gz
gentoo-2-7dabe4c5ceec669e85af2da17566fe5419f7c2ab.tar.bz2
gentoo-2-7dabe4c5ceec669e85af2da17566fe5419f7c2ab.zip
Ignore flags '--with-compiler/--with-gcc' passed by cabal with 'QA_CONFIGURE_OPTIONS'. Bug #515354 by Patrick Lauer, bug #469618 by Roman Žilka.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-lang/ghc')
-rw-r--r--dev-lang/ghc/ChangeLog7
-rw-r--r--dev-lang/ghc/ghc-7.6.3-r1.ebuild5
2 files changed, 10 insertions, 2 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 85ae7695e4af..4bdcc5868423 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.255 2014/04/22 14:09:47 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.256 2014/06/27 09:54:02 slyfox Exp $
+
+ 27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+ Ignore flags '--with-compiler/--with-gcc' passed by cabal with
+ 'QA_CONFIGURE_OPTIONS'. Bug #515354 by Patrick Lauer, bug #469618 by Roman
+ Žilka.
22 Apr 2014; Michael Orlitzky <mjo@gentoo.org> metadata.xml:
Fix typo in llvm USE flag description, fixes bug #508398.
diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
index 35bfb702d1cb..d2fd97b8b7cc 100644
--- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.10 2014/04/03 20:05:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.11 2014/06/27 09:54:02 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -125,6 +125,9 @@ REQUIRED_USE="ia64? ( !gmp )"
use binary && QA_PREBUILT="*"
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}