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 54A54138AE9 for ; Wed, 27 Dec 2017 23:30:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB32CE0F4D; Wed, 27 Dec 2017 23:30:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 9D71EE0F4D for ; Wed, 27 Dec 2017 23:30:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3CE08341236 for ; Wed, 27 Dec 2017 23:30:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9D98AFB8 for ; Wed, 27 Dec 2017 23:30:17 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1514417375.ecd3fbd78c0a41984716d97408b0b63cb306e5f7.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/armadillo/Manifest sci-libs/armadillo/armadillo-8.300.2.ebuild X-VCS-Directories: sci-libs/armadillo/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: ecd3fbd78c0a41984716d97408b0b63cb306e5f7 X-VCS-Branch: master Date: Wed, 27 Dec 2017 23:30:17 +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: 1ad6fec3-d3fb-4562-9a58-7682796b35aa X-Archives-Hash: ea6e2b510a75b2048232c0d19f12e26b commit: ecd3fbd78c0a41984716d97408b0b63cb306e5f7 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Dec 27 21:36:59 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Wed Dec 27 23:29:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd3fbd7 sci-libs/armadillo: Version bump Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-libs/armadillo/Manifest | 1 + sci-libs/armadillo/armadillo-8.300.2.ebuild | 143 ++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 0656402728a..5b4febf2e38 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,3 +1,4 @@ DIST armadillo-6.200.3.tar.gz 5442342 BLAKE2B b67b942dcf5da9b878465b2458ce78a61acc1fbc8a05a345a3df70c467e7ac4c3c8a6bac745897fd3b8786dfbce71dabca0d11f9d101df46e9a1d59f7242e84d SHA512 598ba8be19971fc0e44703b17be922568e697c592ed85d0148c31f8476ecd7b5a0e6185918763bc063ba68244330b17594333c1453e9c1cfd39b9fefe85be222 DIST armadillo-7.950.1.tar.xz 4022716 BLAKE2B 9f6961c9745caa4c7347082f77934a90487daf1c03fc342133ef06e13dbfad38cc9e2f8713015b93fc277ae2ccd61302d7ba55f2a82ccd997b67eae481f6442c SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d DIST armadillo-8.200.0.tar.xz 4456824 BLAKE2B a9124c8e15807a00b8495e90934d71a3b270e8bf5c9319fe3a28c2e65ed4d8f23e7ca61992a661e8e7f65244203da65d85514ebd91b9adf7edb055551d9177d0 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9 +DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c diff --git a/sci-libs/armadillo/armadillo-8.300.2.ebuild b/sci-libs/armadillo/armadillo-8.300.2.ebuild new file mode 100644 index 00000000000..dccb43520ea --- /dev/null +++ b/sci-libs/armadillo/armadillo-8.300.2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_IN_SOURCE_BUILD=1 + +inherit cmake-utils toolchain-funcs multilib eutils + +DESCRIPTION="Streamlined C++ linear algebra library" +HOMEPAGE="http://arma.sourceforge.net/" +SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0/8" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test" +REQUIRED_USE="test? ( lapack )" + +# atlas? ( sci-libs/atlas[lapack] ) + +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack ) + superlu? ( >=sci-libs/superlu-5.2 ) +" + +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + hdf5? ( sci-libs/hdf5 ) + lapack? ( virtual/pkgconfig ) + mkl? ( sci-libs/mkl ) + tbb? ( dev-cpp/tbb )" +PDEPEND="${RDEPEND} + hdf5? ( sci-libs/hdf5 ) + mkl? ( sci-libs/mkl ) + tbb? ( dev-cpp/tbb )" + +src_prepare() { + # avoid the automagic cmake macros + sed -i -e '/ARMA_Find/d' CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + -DARMA_EXTRA_DEBUG="$(usex debug)" + -DARMA_USE_MKL_ALLOC="$(usex mkl)" + -DARMA_USE_TBB_ALLOC="$(usex tbb)" + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + else + mycmakeargs+=( + -DARPACK_FOUND=OFF + ) + fi +# if use atlas; then +# local c=atlas-cblas l=atlas-clapack +# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads +# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads +# mycmakeargs+=( +# -DCBLAS_FOUND=ON +# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" +# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" +# -DCLAPACK_FOUND=ON +# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" +# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" +# ) +# fi + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + else + mycmakeargs+=( + -DBLAS_FOUND=OFF + ) + fi + if use hdf5; then + mycmakeargs+=( + -DHDF5_FOUND=ON + -DHDF5_LIBRARIES="-lhdf5" + ) + else + mycmakeargs+=( + -DHDF5_FOUND=OFF + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + else + mycmakeargs+=( + -DLAPACK_FOUND=OFF + ) + fi + if use superlu; then + mycmakeargs+=( + -DSuperLU_FOUND=ON + -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" + -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" + ) + else + mycmakeargs+=( + -DSuperLU_FOUND=OFF + ) + fi + + cmake-utils_src_configure +} + +src_test() { + pushd examples > /dev/null + emake \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ + LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die + emake clean + popd > /dev/null +} + +src_install() { + cmake-utils_src_install + dodoc README.txt + use doc && dodoc *pdf *html + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi +}