diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-03-28 13:32:40 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-03-28 13:32:40 +0000 |
| commit | b00774ed3f7007443b2a207e39e3143b71cfc6f0 (patch) | |
| tree | 55a2a0a6f2245daa2981a7e7f74da73ea8c32d55 /eclass | |
| parent | Fix broken configure patch, #544612 (diff) | |
| download | gentoo-2-b00774ed3f7007443b2a207e39e3143b71cfc6f0.tar.gz gentoo-2-b00774ed3f7007443b2a207e39e3143b71cfc6f0.tar.bz2 gentoo-2-b00774ed3f7007443b2a207e39e3143b71cfc6f0.zip | |
Enable building dynamic haskell executables since dev-lang/ghc-7.10.1_rc3.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/ghc-package.eclass | 9 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 12 |
3 files changed, 15 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 449627532d77..1ee03e8696fa 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1574 2015/03/26 16:15:33 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1575 2015/03/28 13:32:40 slyfox Exp $ + + 28 Mar 2015; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass, + haskell-cabal.eclass: + Enable building dynamic haskell executables since dev-lang/ghc-7.10.1_rc3. 26 Mar 2015; <grknight@gentoo.org> php-ext-source-r2.eclass: Add deprecation warning when USE_PHP is empty diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 4c5e1bf41be3..6184a56ffc49 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.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/ghc-package.eclass,v 1.40 2015/01/01 21:23:03 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.41 2015/03/28 13:32:40 slyfox Exp $ # @ECLASS: ghc-package.eclass # @MAINTAINER: @@ -126,13 +126,6 @@ ghc-supports-smp() { $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES" } -# @FUNCTION: ghc-supports-dynamic-by-default -# @DESCRIPTION: -# checks if ghc links against shared haskell libraries by default -ghc-supports-dynamic-by-default() { - $(ghc-getghc) --info | grep "Dynamic by default" | grep -q "YES" -} - # @FUNCTION: ghc-supports-interpreter # @DESCRIPTION: # checks if ghc has interpreter mode (aka GHCi) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 33acb69982a0..daf950215532 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.49 2015/03/15 17:03:27 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.50 2015/03/28 13:32:40 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -388,8 +388,14 @@ cabal-configure() { if $(ghc-supports-shared-libraries); then # maybe a bit lower - if $(ghc-supports-dynamic-by-default); then - cabalconf+=(--enable-shared) + 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 + # Known to break on ghc-7.8/Cabal-1.18 + # https://ghc.haskell.org/trac/ghc/ticket/9625 + cabalconf+=(--enable-executable-dynamic) fi fi |