From 7548ad574b59f7453b12cd0651e123b32a6e99ef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Apr 2015 20:33:05 +0000 Subject: Disable building dynamic libraris by default before-ghc-7.10 (was accidentally enabled in a previous revision). Fixes bug #545174 by Toralf Förster. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eclass/ChangeLog | 7 ++++++- eclass/haskell-cabal.eclass | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'eclass') 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 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; 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) -- cgit v1.2.3-65-gdbad