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 74B53198005 for ; Fri, 22 Feb 2013 10:16:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1137921C0D8; Fri, 22 Feb 2013 10:15:51 +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 101BD21C0D1 for ; Fri, 22 Feb 2013 10:15:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4BC533E12F for ; Fri, 22 Feb 2013 10:15:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 28B0EE408F for ; Fri, 22 Feb 2013 10:15:46 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1361528118.feee3be41866e292a945d0494f9329dad2f43998.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-ml/lacaml/ X-VCS-Repository: proj/sci X-VCS-Files: dev-ml/lacaml/ChangeLog dev-ml/lacaml/lacaml-7.0.3.ebuild dev-ml/lacaml/metadata.xml X-VCS-Directories: dev-ml/lacaml/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: feee3be41866e292a945d0494f9329dad2f43998 X-VCS-Branch: master Date: Fri, 22 Feb 2013 10:15:46 +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: 72051814-453e-443c-995c-254a889cd16a X-Archives-Hash: ddca2fc2ac24f0d71be2533c6acba1c6 commit: feee3be41866e292a945d0494f9329dad2f43998 Author: Justin Lecher gentoo org> AuthorDate: Fri Feb 22 10:15:18 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Feb 22 10:15:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=feee3be4 dev-ml/lacaml: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config Package-Manager: portage-2.2.0_alpha163 --- dev-ml/lacaml/ChangeLog | 6 +++++- dev-ml/lacaml/lacaml-7.0.3.ebuild | 12 +++++++----- dev-ml/lacaml/metadata.xml | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dev-ml/lacaml/ChangeLog b/dev-ml/lacaml/ChangeLog index d9eb022..d66dc0b 100644 --- a/dev-ml/lacaml/ChangeLog +++ b/dev-ml/lacaml/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for dev-ml/lacaml -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Feb 2013; Justin Lecher lacaml-7.0.3.ebuild, + metadata.xml: + Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config + *lacaml-7.0.3 (28 Jul 2012) 28 Jul 2012; Guillaume Horel diff --git a/dev-ml/lacaml/lacaml-7.0.3.ebuild b/dev-ml/lacaml/lacaml-7.0.3.ebuild index ad9fbd1..1b6d6f5 100644 --- a/dev-ml/lacaml/lacaml-7.0.3.ebuild +++ b/dev-ml/lacaml/lacaml-7.0.3.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=4 OASIS_BUILD_DOCS=1 -inherit oasis + +inherit oasis toolchain-funcs DESCRIPTION="BLAS/LAPACK interface for OCaml" HOMEPAGE="http://forge.ocamlcore.org/projects/lacaml" @@ -16,7 +17,8 @@ SLOT="0" KEYWORDS="~x86" IUSE="" -RDEPEND="virtual/blas +RDEPEND=" + virtual/blas virtual/lapack" DEPEND="${DEPEND} virtual/pkgconfig" @@ -27,10 +29,10 @@ src_prepare() { if use doc; then cp "${FILESDIR}/API.odocl" . || die fi - cclib="$(pkg-config --libs blas lapack)" + cclib="$($(tc-getPKG_CONFIG) --libs blas lapack)" cclib="[$(echo $cclib|sed -e 's/\(-[a-z0-9]*\) /\"\1\"\;/g' -e \ 's/\(-[a-z0-9]*\)$/\"\1\"/')]" sed -i "s/cclib = \[\]/cclib = ${cclib}/" setup.conf #would like to do the below, but doesn't work from ebuild - #oasis_configure_opts="--override conf_cclib $(pkg-config --libs blas lapack)" + #oasis_configure_opts="--override conf_cclib $($(tc-getPKG_CONFIG) --libs blas lapack)" } diff --git a/dev-ml/lacaml/metadata.xml b/dev-ml/lacaml/metadata.xml index 8925df6..e0b7a09 100644 --- a/dev-ml/lacaml/metadata.xml +++ b/dev-ml/lacaml/metadata.xml @@ -1,8 +1,8 @@ -sci - + sci + BLAS/LAPACK-interface for OCaml