public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/
Date: Wed, 20 Jan 2021 21:46:24 +0000 (UTC)	[thread overview]
Message-ID: <1611179160.d0b14dd484a3395d343e0250bc1a09b9d3833953.dilfridge@gentoo> (raw)

commit:     d0b14dd484a3395d343e0250bc1a09b9d3833953
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 21:43:40 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 21:46:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b14dd4

sci-libs/armadillo: Version bump

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sci-libs/armadillo/Manifest                |   1 +
 sci-libs/armadillo/armadillo-10.2.0.ebuild | 148 +++++++++++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index b81f29c2eae..d603294cedd 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,2 +1,3 @@
+DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
 DIST armadillo-9.850.1.tar.xz 4715832 BLAKE2B 41256d8f54ec1f2d4f7cfdf58bd67e66cc2ffbe0f1daf259a4d76e0816d89708fa5528d57b244000393404108c8d0d613d03321f14e5653163d0c1cc6ec7e273 SHA512 b2b9f0290f8f39a687db71a02b127086d5ff22cee77fba5211da2ea8a8d8a5edc256b31b7fce8e98aa1955a84c63e488adcd22f8cd070015a6fcd4b4f1cb37c7

diff --git a/sci-libs/armadillo/armadillo-10.2.0.ebuild b/sci-libs/armadillo/armadillo-10.2.0.ebuild
new file mode 100644
index 00000000000..baaa3579072
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-10.2.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake 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/10"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+RESTRICT="!test? ( 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 )
+"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+"
+
+src_prepare() {
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	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+=(
+			-DDETECT_HDF5=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+			-DHDF5_INCLUDE_DIRS=/usr/include
+		)
+	else
+		mycmakeargs+=(
+			-DDETECT_HDF5=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_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_src_install
+	dodoc README.md
+	use doc && dodoc *pdf *html
+	if use examples; then
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}


             reply	other threads:[~2021-01-20 21:46 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-20 21:46 Andreas K. Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-23  4:17 [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/ Sam James
2024-04-25 10:39 Andreas K. Hüttel
2023-08-25 16:37 Arthur Zamarin
2023-08-25 13:11 Arthur Zamarin
2023-07-30 19:04 Andreas Sturmlechner
2023-07-30 19:04 Andreas Sturmlechner
2023-07-30 19:04 Andreas Sturmlechner
2023-07-30 17:18 Arthur Zamarin
2023-07-27 19:42 Andreas Sturmlechner
2023-07-10 19:39 Arthur Zamarin
2023-06-11 23:25 Andreas K. Hüttel
2023-06-11 23:25 Andreas K. Hüttel
2023-04-07 12:38 Andreas K. Hüttel
2022-11-19 11:41 Andrew Ammerlaan
2022-10-15  7:06 Jakov Smolić
2022-10-15  6:44 Jakov Smolić
2022-02-28 23:21 Andreas K. Hüttel
2022-02-28 23:21 Andreas K. Hüttel
2021-10-10 14:25 Andreas K. Hüttel
2021-05-28 15:57 David Seifert
2021-03-12 23:58 Andreas K. Hüttel
2021-03-02  9:06 Michał Górny
2021-03-02  4:51 Sam James
2021-03-02  4:51 Sam James
2021-03-02  4:51 Sam James
2021-02-11  7:45 Sergei Trofimovich
2021-01-17 11:52 David Seifert
2020-02-22 20:13 David Seifert
2019-12-22 13:44 Andreas K. Hüttel
2019-12-22 13:44 Andreas K. Hüttel
2019-12-22 13:07 Andreas K. Hüttel
2018-12-25 16:06 Andreas K. Hüttel
2018-12-04 22:19 Andreas K. Hüttel
2018-10-14 13:38 Andreas Sturmlechner
2018-08-22  0:35 Mikle Kolyada
2018-08-18 22:36 Sergei Trofimovich
2017-12-27 23:30 Andreas Hüttel
2017-12-27 23:30 Andreas Hüttel
2017-10-13  9:21 Andreas Hüttel
2017-07-11 20:33 Sebastien Fabbro
2017-06-09 11:28 Andreas Hüttel
2017-06-09 11:28 Andreas Hüttel
2017-04-16 14:12 Andreas Hüttel
2017-04-16 14:12 Andreas Hüttel
2017-03-24 13:52 Andreas Hüttel
2017-02-26  9:15 Michael Palimaka
2017-02-24  0:13 Michael Weber
2016-12-18 15:44 Agostino Sarubbo
2016-12-17 14:47 Andreas Hüttel
2016-12-13 20:32 Andreas Hüttel
2016-12-13 20:15 Andreas Hüttel
2016-12-13 20:15 Andreas Hüttel
2015-11-12 23:20 Andreas Hüttel
2015-11-10 19:07 Markus Meier
2015-10-23 15:39 Andreas Hüttel
2015-10-23 15:39 Andreas Hüttel
2015-09-22  5:04 Jeroen Roovers
2015-09-08 20:57 Andreas Hüttel
2015-09-08 20:56 Andreas Hüttel
2015-09-01 19:44 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1611179160.d0b14dd484a3395d343e0250bc1a09b9d3833953.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox