From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBC20139694 for ; Tue, 11 Jul 2017 20:45:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 396D72340A7; Tue, 11 Jul 2017 20:45:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19D842340A7 for ; Tue, 11 Jul 2017 20:45:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27D16341748 for ; Tue, 11 Jul 2017 20:45:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ED477497 for ; Tue, 11 Jul 2017 20:45:18 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1499805914.9caff4ab10a45797edba0d91ee4991613301d57d.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ghc/ghc-7.10.3.ebuild dev-lang/ghc/ghc-8.0.2.ebuild X-VCS-Directories: dev-lang/ghc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 9caff4ab10a45797edba0d91ee4991613301d57d X-VCS-Branch: master Date: Tue, 11 Jul 2017 20:45:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ca8287bb-4893-4c16-a33d-c30dcf5e9bd0 X-Archives-Hash: 4ed8089f5d3194e6a7afe00a75e3759b commit: 9caff4ab10a45797edba0d91ee4991613301d57d Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jul 11 20:45:06 2017 +0000 Commit: Sergei Trofimovich gentoo 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