slyfox      15/03/28 13:32:40

  Modified:             ChangeLog ghc-package.eclass haskell-cabal.eclass
  Log:
  Enable building dynamic haskell executables since dev-lang/ghc-7.10.1_rc3.

Revision  Changes    Path
1.1575               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1575&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1575&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1574&r2=1.1575

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1574
retrieving revision 1.1575
diff -u -r1.1574 -r1.1575
--- ChangeLog   26 Mar 2015 16:15:33 -0000      1.1574
+++ ChangeLog   28 Mar 2015 13:32:40 -0000      1.1575
@@ -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 <[email protected]> ghc-package.eclass,
+  haskell-cabal.eclass:
+  Enable building dynamic haskell executables since dev-lang/ghc-7.10.1_rc3.
 
   26 Mar 2015; <[email protected]> php-ext-source-r2.eclass:
   Add deprecation warning when USE_PHP is empty



1.41                 eclass/ghc-package.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.41&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.41&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?r1=1.40&r2=1.41

Index: ghc-package.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ghc-package.eclass  1 Jan 2015 21:23:03 -0000       1.40
+++ ghc-package.eclass  28 Mar 2015 13:32:40 -0000      1.41
@@ -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-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)



1.50                 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.50&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.50&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.49&r2=1.50

Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- haskell-cabal.eclass        15 Mar 2015 17:03:27 -0000      1.49
+++ haskell-cabal.eclass        28 Mar 2015 13:32:40 -0000      1.50
@@ -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 @@
 
        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
 




Reply via email to