diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-11-16 15:47:17 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-11-16 15:47:17 +0000 |
| commit | 16c7ef4c334304da9a8972ef56baf1d58b1c5dfc (patch) | |
| tree | 70e0066fd6b776923418158be697c758049d2d3f /eclass/ghc-package.eclass | |
| parent | http://my.opera.com/desktopteam/blog/2012/11/16/opera-12-11-rc2 (diff) | |
| download | gentoo-2-16c7ef4c334304da9a8972ef56baf1d58b1c5dfc.tar.gz gentoo-2-16c7ef4c334304da9a8972ef56baf1d58b1c5dfc.tar.bz2 gentoo-2-16c7ef4c334304da9a8972ef56baf1d58b1c5dfc.zip | |
Restore dynamic linking of Cabal's ./setup and add building of shared libraries for ghc-7.7+.
Diffstat (limited to 'eclass/ghc-package.eclass')
| -rw-r--r-- | eclass/ghc-package.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index e687630dd015..a9b8e7a1ba37 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.34 2012/09/14 02:51:23 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.35 2012/11/16 15:47:17 slyfox Exp $ # @ECLASS: ghc-package.eclass # @MAINTAINER: @@ -39,7 +39,11 @@ ghc-getghcpkgbin() { # the ghc-pkg executable changed name in ghc 6.10, as it no longer needs # the wrapper script with the static flags echo '[]' > "${T}/empty.conf" - if version_is_at_least "7.5.20120516" "$(ghc-version)"; then + if version_is_at_least "7.7.20121101" "$(ghc-version)"; then + # was moved to bin/ subtree by: + # http://www.haskell.org/pipermail/cvs-ghc/2012-September/076546.html + echo "$(ghc-libdir)/bin/ghc-pkg" "--global-package-db=${T}/empty.conf" + elif version_is_at_least "7.5.20120516" "$(ghc-version)"; then echo "$(ghc-libdir)/ghc-pkg" "--global-package-db=${T}/empty.conf" else echo "$(ghc-libdir)/ghc-pkg" "--global-conf=${T}/empty.conf" |