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 770901382C5 for ; Tue, 20 Apr 2021 19:31:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D21A2E084A; Tue, 20 Apr 2021 19:31:28 +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 AF8BBE084A for ; Tue, 20 Apr 2021 19:31:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A73B0335DC6 for ; Tue, 20 Apr 2021 19:31:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 460355C9 for ; Tue, 20 Apr 2021 19:31:25 +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: <1618947081.efe8d14608f9b047bf92652c347fe9eb2a775400.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-8.10.4.ebuild dev-lang/ghc/ghc-8.8.4.ebuild dev-lang/ghc/ghc-9.0.1.ebuild X-VCS-Directories: dev-lang/ghc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: efe8d14608f9b047bf92652c347fe9eb2a775400 X-VCS-Branch: master Date: Tue, 20 Apr 2021 19:31:25 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8b9e61ff-81bb-481a-9283-6da0008508dd X-Archives-Hash: 74b735f0588ebb795ae6ebadd3f64851 commit: efe8d14608f9b047bf92652c347fe9eb2a775400 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Apr 20 19:30:38 2021 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Apr 20 19:31:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe8d146 dev-lang/ghc: use ${EPYTHON} Reported-by: Agostino Sarubbo Closes: https://bugs.gentoo.org/774141 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> dev-lang/ghc/ghc-8.10.4.ebuild | 19 +++++++++++++++++-- dev-lang/ghc/ghc-8.8.4.ebuild | 22 +++++++++++++++++++--- dev-lang/ghc/ghc-9.0.1.ebuild | 19 +++++++++++++++++-- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild index 26565839933..3e4cfb0d0db 100644 --- a/dev-lang/ghc/ghc-8.10.4.ebuild +++ b/dev-lang/ghc/ghc-8.10.4.ebuild @@ -13,6 +13,8 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then fi fi +PYTHON_COMPAT=( python3_{7..9} ) +inherit python-any-r1 inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package inherit multilib multiprocessing pax-utils toolchain-funcs prefix inherit check-reqs @@ -105,14 +107,23 @@ PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) + test? ( ${PYTHON_DEPS} ) +" + +needs_python() { + # test driver is written in python + use test && return 0 + return 1 +} # we build binaries without profiling support REQUIRED_USE=" @@ -380,6 +391,10 @@ pkg_setup() { die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" fi fi + + if needs_python; then + python-any-r1_pkg_setup + fi } src_unpack() { diff --git a/dev-lang/ghc/ghc-8.8.4.ebuild b/dev-lang/ghc/ghc-8.8.4.ebuild index 2b7cd22116b..8bf1fa84bbb 100644 --- a/dev-lang/ghc/ghc-8.8.4.ebuild +++ b/dev-lang/ghc/ghc-8.8.4.ebuild @@ -13,6 +13,8 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then fi fi +PYTHON_COMPAT=( python3_{7..9} ) +inherit python-any-r1 inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package inherit multilib multiprocessing pax-utils toolchain-funcs prefix inherit check-reqs @@ -104,14 +106,23 @@ PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) + test? ( ${PYTHON_DEPS} ) +" + +needs_python() { + # test driver is written in python + use test && return 0 + return 1 +} # we build binaries without profiling support REQUIRED_USE=" @@ -389,6 +400,10 @@ pkg_setup() { die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" fi fi + + if needs_python; then + python-any-r1_pkg_setup + fi } src_unpack() { @@ -436,6 +451,7 @@ src_prepare() { pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 + use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 popd > /dev/null @@ -640,7 +656,7 @@ src_configure() { # using ${GTARGET}'s libffi is not supported yet: # GHC embeds full path for ffi includes without /usr/${CTARGET} account. econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) + econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) fi einfo "Final mk/build.mk:" diff --git a/dev-lang/ghc/ghc-9.0.1.ebuild b/dev-lang/ghc/ghc-9.0.1.ebuild index 3a1b5e9d9a8..9f33f2d0b49 100644 --- a/dev-lang/ghc/ghc-9.0.1.ebuild +++ b/dev-lang/ghc/ghc-9.0.1.ebuild @@ -13,6 +13,8 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then fi fi +PYTHON_COMPAT=( python3_{7..9} ) +inherit python-any-r1 inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package inherit multilib multiprocessing pax-utils toolchain-funcs prefix inherit check-reqs @@ -105,14 +107,23 @@ PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) + test? ( ${PYTHON_DEPS} ) +" + +needs_python() { + # test driver is written in python + use test && return 0 + return 1 +} # we build binaries without profiling support REQUIRED_USE=" @@ -380,6 +391,10 @@ pkg_setup() { die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" fi fi + + if needs_python; then + python-any-r1_pkg_setup + fi } src_unpack() {