diff options
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/ghc-package.eclass | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 695b64378a01..5ad9284c085d 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.397 2012/09/12 22:52:18 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.398 2012/09/14 02:51:23 gienah Exp $ + + 14 Sep 2012; Mark Wright <gienah@gentoo.org> ghc-package.eclass: + ghc-pkg --global-conf parameter is renamed to --global-package-db in ghc + 7.6.1 12 Sep 2012; Jory A. Pratt <anarchy@gentoo.org> mozconfig-3.eclass: Disable crashreporter on all source builds, bug #433962. diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index a100e04f90f1..e687630dd015 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.33 2012/04/09 18:08:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.34 2012/09/14 02:51:23 gienah 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" - echo "$(ghc-libdir)/ghc-pkg" "--global-conf=${T}/empty.conf" + if 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" + fi } # @FUNCTION: ghc-version |