diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-04-04 20:33:05 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-04-04 20:33:05 +0000 |
| commit | edc7987f80b5dfa686048d4fd0ede866b0724ed9 (patch) | |
| tree | 028ab525b9967aa73144e9f9875e1f2e5c6afe27 /eclass | |
| parent | Mark arm64/s390/sh stable. (diff) | |
| download | gentoo-2-edc7987f80b5dfa686048d4fd0ede866b0724ed9.tar.gz gentoo-2-edc7987f80b5dfa686048d4fd0ede866b0724ed9.tar.bz2 gentoo-2-edc7987f80b5dfa686048d4fd0ede866b0724ed9.zip | |
Disable building dynamic libraris by default before-ghc-7.10 (was accidentally enabled in a previous revision). Fixes bug #545174 by Toralf Förster.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b8c0f71adf82..d7696cd981c8 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1582 2015/04/04 17:11:35 perfinion Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1583 2015/04/04 20:33:05 slyfox Exp $ + + 04 Apr 2015; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass: + Disable building dynamic libraris by default before-ghc-7.10 (was + accidentally enabled in a previous revision). Fixes bug #545174 by Toralf + Förster. 04 Apr 2015; <jason@gentoo.org> selinux-policy-2.eclass: Drop EAPI<5 from selinux-policy-2.eclass diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index daf950215532..7f733725af97 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.50 2015/03/28 13:32:40 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.51 2015/04/04 20:33:05 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -387,12 +387,11 @@ cabal-configure() { cabalconf+=(--enable-shared) if $(ghc-supports-shared-libraries); then - # maybe a bit lower - cabalconf+=(--enable-shared) - # Experimental support for dynamically linked binaries. # We are enabling it since 7.10.1_rc3 if version_is_at_least "7.10.0.20150316" "$(ghc-version)"; then + # we didn't enable it before as it was not stable on all arches + cabalconf+=(--enable-shared) # Known to break on ghc-7.8/Cabal-1.18 # https://ghc.haskell.org/trac/ghc/ticket/9625 cabalconf+=(--enable-executable-dynamic) |