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 AA075138CE3 for ; Mon, 10 Feb 2014 04:14:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6AF7E0A10; Mon, 10 Feb 2014 04:14:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7CE6E0A10 for ; Mon, 10 Feb 2014 04:14:23 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA10833F8A1 for ; Mon, 10 Feb 2014 04:14:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B687E18877 for ; Mon, 10 Feb 2014 04:14:21 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1391973937.36897fb005324e6cb1abb63c9257766987313576.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/armadillo/ChangeLog sci-libs/armadillo/armadillo-4.000.3.ebuild sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch X-VCS-Directories: sci-libs/armadillo/ sci-libs/armadillo/files/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 36897fb005324e6cb1abb63c9257766987313576 X-VCS-Branch: master Date: Mon, 10 Feb 2014 04:14:21 +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: dc046e08-62c3-4ceb-a04f-ecc24af18940 X-Archives-Hash: ccf62e6e41e70ebf46e8e81c580af3c8 commit: 36897fb005324e6cb1abb63c9257766987313576 Author: Sébastien Fabbro gentoo org> AuthorDate: Sun Feb 9 19:25:37 2014 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Sun Feb 9 19:25:37 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36897fb0 sci-libs/armadillo: Version bump Package-Manager: portage-2.2.8-prefix --- sci-libs/armadillo/ChangeLog | 6 ++ sci-libs/armadillo/armadillo-4.000.3.ebuild | 109 +++++++++++++++++++++ .../armadillo/files/armadillo-4.000.3-hdf5.patch | 19 ++++ 3 files changed, 134 insertions(+) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index 98a692c..721a0a1 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*armadillo-4.000.3 (09 Feb 2014) + + 09 Feb 2014; Sébastien Fabbro +armadillo-4.000.3.ebuild, + +files/armadillo-4.000.3-hdf5.patch: + sci-libs/armadillo: Version bump + 08 Feb 2014; Reinis Danne armadillo-3.930.0.ebuild: Fix cblas, clapack include dir. diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild new file mode 100644 index 0000000..7b82540 --- /dev/null +++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +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.gz" + +LICENSE="MPL-2.0" +SLOT="0/4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack atlas blas debug doc examples hdf5 int64 lapack mkl tbb test" +REQUIRED_USE="test? ( lapack )" + +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + atlas? ( sci-libs/atlas[lapack] ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack )" +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + atlas? ( 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() { + epatch \ + "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \ + "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch + # avoid the automagic cmake macros + sed -i -e '/ARMA_Find/d' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + $(cmake-utils_use debug ARMA_EXTRA_DEBUG) + $(cmake-utils_use int64 ARMA_64BIT_WORD) + $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) + $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + fi + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + 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 + cmake-utils_src_configure +} + +src_test() { + pushd examples > /dev/null + emake \ + CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ + EXTRA_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 +} + +src_install() { + cmake-utils_src_install + dodoc README.txt + use doc && dodoc *pdf && dohtml *html + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + fi +} diff --git a/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch b/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch new file mode 100644 index 0000000..4510cd8 --- /dev/null +++ b/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch @@ -0,0 +1,19 @@ +--- armadillo-4.000.2/CMakeLists.txt.orig 2014-02-03 14:47:35.023255183 -0800 ++++ armadillo-4.000.2/CMakeLists.txt 2014-02-03 21:19:47.567376544 -0800 +@@ -227,11 +227,11 @@ + # find_package(HDF5) + # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") + # +-# if(HDF5_FOUND) +-# set(ARMA_USE_HDF5 true) +-# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) +-# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) +-# endif() ++if(HDF5_FOUND) ++ set(ARMA_USE_HDF5 true) ++ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) ++ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) ++ endif() + + + include(ARMA_FindARPACK)