From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6BB8A138307 for ; Sun, 6 Jan 2013 13:06:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47D3FE057F; Sun, 6 Jan 2013 13:06:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4F5FE057F for ; Sun, 6 Jan 2013 13:06:37 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1CB133DA41 for ; Sun, 6 Jan 2013 13:06:36 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2272) id 699832171D; Sun, 6 Jan 2013 13:06:35 +0000 (UTC) From: "Sergei Trofimovich (slyfox)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, slyfox@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ghc-package.eclass haskell-cabal.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog ghc-package.eclass haskell-cabal.eclass X-VCS-Directories: eclass X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130106130635.699832171D@flycatcher.gentoo.org> Date: Sun, 6 Jan 2013 13:06:35 +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: 25ba4fb7-45c5-4dd9-b792-e4b5a590e794 X-Archives-Hash: 3600c6afd959fa04d1426f0d47e9364b slyfox 13/01/06 13:06:35 Modified: ChangeLog ghc-package.eclass haskell-cabal.eclass Log: Added 'ghc-supports-threaded-runtime' function. Removed implicit RDEPEND on 'ghc'. Revision Changes Path 1.602 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.602&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.602&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.601&r2=1.602 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.601 retrieving revision 1.602 diff -u -r1.601 -r1.602 --- ChangeLog 5 Jan 2013 10:02:44 -0000 1.601 +++ ChangeLog 6 Jan 2013 13:06:35 -0000 1.602 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.601 2013/01/05 10:02:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.602 2013/01/06 13:06:35 slyfox Exp $ + + 06 Jan 2013; Sergei Trofimovich ghc-package.eclass, + haskell-cabal.eclass: + Added 'ghc-supports-threaded-runtime' function. Removed implicit RDEPEND on + 'ghc'. 05 Jan 2013; Michał Górny distutils-r1.eclass: Support overriding job-count for parallel build. 1.36 eclass/ghc-package.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?r1=1.35&r2=1.36 Index: ghc-package.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ghc-package.eclass 16 Nov 2012 15:47:17 -0000 1.35 +++ ghc-package.eclass 6 Jan 2013 13:06:35 -0000 1.36 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.35 2012/11/16 15:47:17 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.36 2013/01/06 13:06:35 slyfox Exp $ # @ECLASS: ghc-package.eclass # @MAINTAINER: @@ -94,6 +94,14 @@ $(ghc-getghc) --info | grep "RTS ways" | grep -q "dyn" } +# @FUNCTION: ghc-supports-threaded-runtime +# @DESCRIPTION: +# checks if ghc is built with support for threaded +# runtime (aka '-threaded' option) +ghc-supports-threaded-runtime() { + $(ghc-getghc) --info | grep "RTS ways" | grep -q "thr" +} + # @FUNCTION: ghc-extractportageversion # @DESCRIPTION: # extract the version of a portage-installed package 1.38 eclass/haskell-cabal.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.37&r2=1.38 Index: haskell-cabal.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- haskell-cabal.eclass 19 Nov 2012 21:27:56 -0000 1.37 +++ haskell-cabal.eclass 6 Jan 2013 13:06:35 -0000 1.38 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.37 2012/11/19 21:27:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.38 2013/01/06 13:06:35 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -134,11 +134,6 @@ DEPEND="${DEPEND} >=dev-haskell/cabal-${CABAL_MIN_VERSION}" fi -# Libraries require GHC to be installed. -if [[ -n "${CABAL_HAS_LIBRARIES}" ]]; then - RDEPEND="${RDEPEND} dev-lang/ghc" -fi - # returns the version of cabal currently in use _CABAL_VERSION_CACHE="" cabal-version() { @@ -384,6 +379,9 @@ # exported function: check if cabal is correctly installed for # the currently active ghc (we cannot guarantee this with portage) haskell-cabal_pkg_setup() { + if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then + [[ ${RDEPEND} == *dev-lang/ghc* ]] || eqawarn "QA Notice: A library does not have runtime dependency on dev-lang/ghc." + fi if [[ -z "${CABAL_HAS_BINARIES}" ]] && [[ -z "${CABAL_HAS_LIBRARIES}" ]]; then eqawarn "QA Notice: Neither bin nor lib are in CABAL_FEATURES." fi @@ -514,6 +512,8 @@ popd > /dev/null } +# @FUNCTION: cabal_flag +# @DESCRIPTION: # ebuild.sh:use_enable() taken as base # # Usage examples: