commit: 9caff4ab10a45797edba0d91ee4991613301d57d Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Jul 11 20:45:06 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Jul 11 20:45:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9caff4ab
dev-lang/ghc: remove build-type dependency on ncurses, bug #561276 Re-adding ncurses:5 buildtime-only dependency was an accidental bug. ghc binaries explicitly avoid ncurses for bootstrap. Reported-by: Zac Medico Bug: https://bugs.gentoo.org/561276 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-lang/ghc/ghc-7.10.3.ebuild | 11 ++++++++++- dev-lang/ghc/ghc-8.0.2.ebuild | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild index fb6bc873376..71edaa18a56 100644 --- a/dev-lang/ghc/ghc-7.10.3.ebuild +++ b/dev-lang/ghc/ghc-7.10.3.ebuild @@ -84,12 +84,21 @@ RDEPEND=" !ghcmakebinary? ( virtual/libffi:= ) " +# This set of dependencies is needed to run +# prebuilt ghc. We specifically avoid ncurses +# dependency with: +# utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING PREBUILT_BINARY_DEPENDS=" !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) +" +# This set of dependencies is needed to install +# ghc[binary] in system. terminfo package is linked +# against ncurses. +PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} sys-libs/ncurses:5/5 " -RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" +RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" DEPEND="${RDEPEND} doc? ( app-text/docbook-xml-dtd:4.2 diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild index 1fd964ad314..bed207b7b13 100644 --- a/dev-lang/ghc/ghc-8.0.2.ebuild +++ b/dev-lang/ghc/ghc-8.0.2.ebuild @@ -82,11 +82,21 @@ RDEPEND=" !ghcmakebinary? ( virtual/libffi:= ) " +# This set of dependencies is needed to run +# prebuilt ghc. We specifically avoid ncurses +# dependency with: +# utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING PREBUILT_BINARY_DEPENDS=" + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) +" +# This set of dependencies is needed to install +# ghc[binary] in system. terminfo package is linked +# against ncurses. +PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} sys-libs/ncurses:0/6 " -RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" +RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" DEPEND="${RDEPEND} doc? ( app-text/docbook-xml-dtd:4.2
