summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2016-02-09 01:43:07 +0000
committerSébastien Fabbro <bicatali@gentoo.org>2016-02-09 01:43:07 +0000
commit80c3f7dc3f22747972e1ecb3c4718fba745e7c25 (patch)
treeb68bc35fea19da7f98cb461728706a52325d216e
parentsci-astronomy/wcstools: Version bump (diff)
downloadbicatali-80c3f7dc3f22747972e1ecb3c4718fba745e7c25.tar.gz
bicatali-80c3f7dc3f22747972e1ecb3c4718fba745e7c25.tar.bz2
bicatali-80c3f7dc3f22747972e1ecb3c4718fba745e7c25.zip
sci-libs/armadillo: Version bump
-rw-r--r--sci-libs/armadillo/Manifest1
-rw-r--r--sci-libs/armadillo/armadillo-6.500.4.ebuild (renamed from sci-libs/armadillo/armadillo-6.400.3.ebuild)8
2 files changed, 5 insertions, 4 deletions
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 852134a..b18e8f9 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1 +1,2 @@
DIST armadillo-6.400.3.tar.gz 5453832 SHA256 019ce442a1bcad4c5da0bc01ee35333c9a0783ec6a58237ae1e774da68cd4f2f SHA512 cead2ebac1bad8f7baa30bd4eb2c3f68d1a548d65584181d00f14cc9e9316ed37d1392f8503c9718629d6e994b5074f608d677b76dd8b7a371f08a517f4baba2 WHIRLPOOL df659abc8183379f6f1977af4ceaa7c8463fb2be3cadf42a9f2749883cbf542fdd9431b8f86f68614341bde3b9ac61a6f2379f1c1a59c9bb6d13e82f4028daf3
+DIST armadillo-6.500.4.tar.gz 5455985 SHA256 813de85fa61ba5077ed871d801ba7070d369e7e9742002e4c11474c75ff6d1c6 SHA512 71bdf63b7757f02609993b2fb29500b96ae08b5ee1259d0ff8ef8c7321c4b20671abe61afbc9989bb747aac6fd8a82ab565bee1f104afcd2d85f3e3c0d57d8e1 WHIRLPOOL 415a7bc131f44a840b9a19e6054019288a65aa8f0016d87bc00d9daf4d76ec286f62482200898286ace0c752443456dd273708c0364578dee20710c9f876bd7d
diff --git a/sci-libs/armadillo/armadillo-6.400.3.ebuild b/sci-libs/armadillo/armadillo-6.500.4.ebuild
index 852b25b..f373c4e 100644
--- a/sci-libs/armadillo/armadillo-6.400.3.ebuild
+++ b/sci-libs/armadillo/armadillo-6.500.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -103,10 +103,10 @@ src_configure() {
src_test() {
pushd examples > /dev/null
emake \
+ CXX="$(tc-getCXX)" \
CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+ LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
emake clean
popd > /dev/null
}
@@ -114,7 +114,7 @@ src_test() {
src_install() {
cmake-utils_src_install
dodoc README.txt
- use doc && dodoc *pdf && dohtml *html
+ use doc && dodoc *pdf && dodoc *html
if use examples; then
insinto /usr/share/examples/${PF}
doins -r examples/*