summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-04-10 06:04:30 +0000
committerJustin Lecher <jlec@gentoo.org>2013-04-10 06:04:30 +0000
commit2fbce5fc87fb59633203048a65cadce31fc75708 (patch)
treef30efc1581385df5cf2d678f94677a7c6f469283 /sci-libs/armadillo
parentPrevent file collision with libpng15.so.15 which can be part of the libpng16 ... (diff)
downloadgentoo-2-2fbce5fc87fb59633203048a65cadce31fc75708.tar.gz
gentoo-2-2fbce5fc87fb59633203048a65cadce31fc75708.tar.bz2
gentoo-2-2fbce5fc87fb59633203048a65cadce31fc75708.zip
sci-libs/armadillo: Fix typo for pkg-config, #465292
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-libs/armadillo')
-rw-r--r--sci-libs/armadillo/ChangeLog7
-rw-r--r--sci-libs/armadillo/armadillo-3.4.4.ebuild6
-rw-r--r--sci-libs/armadillo/metadata.xml3
3 files changed, 9 insertions, 7 deletions
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index f9479e073694..01563776fa47 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/armadillo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.27 2013/02/07 05:49:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.28 2013/04/10 06:04:30 jlec Exp $
+
+ 10 Apr 2013; Justin Lecher <jlec@gentoo.org> armadillo-3.4.4.ebuild,
+ metadata.xml:
+ Fix typo for pkg-config, #465292
+
*armadillo-3.6.2 (07 Feb 2013)
diff --git a/sci-libs/armadillo/armadillo-3.4.4.ebuild b/sci-libs/armadillo/armadillo-3.4.4.ebuild
index 8bd2db2bf79a..afbf4463b04d 100644
--- a/sci-libs/armadillo/armadillo-3.4.4.ebuild
+++ b/sci-libs/armadillo/armadillo-3.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.6 2013/01/03 05:33:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.7 2013/04/10 06:04:30 jlec Exp $
EAPI=4
@@ -35,13 +35,13 @@ src_configure() {
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
- -DBLAS_LIBRARIES="$($(tc-getPKGCONFIG) --libs blas)"
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
)
fi
if use lapack; then
mycmakeargs+=(
-DLAPACK_FOUND=ON
- -DLAPACK_LIBRARIES="$($(tc-getPKGCONFIG) --libs lapack)"
+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
)
fi
cmake-utils_src_configure
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index c598db146c17..13f3be1f60ae 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -14,7 +14,4 @@
need for temporaries. This is accomplished through recursive
templates and template meta-programming.
</longdescription>
- <use>
- <flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
- </use>
</pkgmetadata>