commit: b9336fb025964398de5493806df1ff3fc213a3c0 Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> AuthorDate: Sat Jun 28 21:22:43 2014 +0000 Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> CommitDate: Sat Jun 28 21:22:43 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9336fb0
sci-libs/armadillo: version bump to 4.300.9 --- sci-libs/armadillo/ChangeLog | 6 ++ sci-libs/armadillo/armadillo-4.300.9.ebuild | 114 ++++++++++++++++++++++++++++ sci-libs/armadillo/metadata.xml | 3 - 3 files changed, 120 insertions(+), 3 deletions(-) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index e7b3f37..ce386e2 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.300.9 (28 Jun 2014) + + 28 Jun 2014; Jauhien Piatlicki <jauh...@gentoo.org> + +armadillo-4.300.9.ebuild, metadata.xml: + version bump, see bug #515624 + *armadillo-4.300.8 (02 Jun 2014) 02 Jun 2014; Sébastien Fabbro <bicat...@gentoo.org> +armadillo-4.300.8.ebuild, diff --git a/sci-libs/armadillo/armadillo-4.300.9.ebuild b/sci-libs/armadillo/armadillo-4.300.9.ebuild new file mode 100644 index 0000000..96ac582 --- /dev/null +++ b/sci-libs/armadillo/armadillo-4.300.9.ebuild @@ -0,0 +1,114 @@ +# 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 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 )" + +PATCHES=( "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch ) + +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)" + $(cmake-utils_use debug ARMA_EXTRA_DEBUG) + $(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 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)" + ) + fi + if use hdf5; then + mycmakeargs+=( + -DHDF5_FOUND=ON + -DHDF5_LIBRARIES="-lhdf5" + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + 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/metadata.xml b/sci-libs/armadillo/metadata.xml index ce0d5f9..385357d 100644 --- a/sci-libs/armadillo/metadata.xml +++ b/sci-libs/armadillo/metadata.xml @@ -19,9 +19,6 @@ Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and clapack </flag> - <flag name='int64'> - Use 64 bits integer for matrix indexation - </flag> <flag name="arpack"> Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition </flag>
