From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E933215808A for ; Sat, 26 Jul 2025 04:33:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DAB20341081 for ; Sat, 26 Jul 2025 04:33:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id DCEFB1102A2; Sat, 26 Jul 2025 04:33:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D393C1102A2 for ; Sat, 26 Jul 2025 04:33:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80569341081 for ; Sat, 26 Jul 2025 04:33:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5D15320C for ; Sat, 26 Jul 2025 04:33:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1753504346.5d2f8d66118b8aa56d20678f30b1397e7b0353d2.sam@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-14.6.1.ebuild X-VCS-Directories: sci-libs/armadillo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5d2f8d66118b8aa56d20678f30b1397e7b0353d2 X-VCS-Branch: master Date: Sat, 26 Jul 2025 04:33:33 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b2c448f-4943-4c7c-aa75-2060b1e47731 X-Archives-Hash: bcad3e8ab56f36c7786af7a9f5e05fb5 commit: 5d2f8d66118b8aa56d20678f30b1397e7b0353d2 Author: Alfred Wingate protonmail com> AuthorDate: Wed Jul 23 15:08:15 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 26 04:32:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2f8d66 sci-libs/armadillo: add 14.6.1 Bug: https://bugs.gentoo.org/902451 Signed-off-by: Alfred Wingate protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43156 Closes: https://github.com/gentoo/gentoo/pull/43156 Signed-off-by: Sam James gentoo.org> sci-libs/armadillo/Manifest | 1 + sci-libs/armadillo/armadillo-14.6.1.ebuild | 151 +++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 8b96ee77685a..e102123a3d7c 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,3 +1,4 @@ DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195 DIST armadillo-12.8.2.tar.xz 6996368 BLAKE2B 63876486dcd72359b243a2ae217de751a9033c7f3e6c8599ba195b52fb493dbc4b6ec7f804916d40cef0c726d3ad42752a5cfb6fd3919935cbdf20e59488e474 SHA512 33bfe6f1fae2ef18ec3286742264dedd67730e47b5187568cb2fbe951286a5a8534a4b577894cc44415887241a46afb25b3fcf2b249ef15f9b71045e98fd0132 DIST armadillo-14.2.3.tar.xz 7191700 BLAKE2B 5e5ba6d65cdc6638de78d7e1f7e5415e1ec345c37e193ff0d999c9c529a514e80b0edace15aad3f3a4467e006127245691c70709726852fc6f495614cc113d21 SHA512 2de9404eae45aa8c919f999202b70dd47b605431cce32da0647f444fbc8ee9f4e3714753d142afc31dfb5dbb27b774dc349390803eb344b9d910eb11ecc8956d +DIST armadillo-14.6.1.tar.xz 7159088 BLAKE2B 538d709bb67cf0e5b76b48b230496dfe67065c429c7656af14e73821669e5688d66e0626045a8671b4225e2c733035aaf3ea58b39a9e447e3ba4df3a78db0c98 SHA512 d78b8a04ff7688bcc0d23ae32107186a68464fe5c66b79142cd84bf088f2cfaac38b0f0119acc02ab472ed1463f1e63241408c787dee0403929d0adf6cfdcb45 diff --git a/sci-libs/armadillo/armadillo-14.6.1.ebuild b/sci-libs/armadillo/armadillo-14.6.1.ebuild new file mode 100644 index 000000000000..c94e43a73b6d --- /dev/null +++ b/sci-libs/armadillo/armadillo-14.6.1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic toolchain-funcs + +DESCRIPTION="Streamlined C++ linear algebra library" +HOMEPAGE="https://arma.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/arma/${P}.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0/14" +KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack blas doc examples lapack mkl superlu test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( arpack lapack superlu )" + +# atlas? ( sci-libs/atlas[lapack] ) +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack ) + mkl? ( sci-libs/mkl ) + superlu? ( >=sci-libs/superlu-5.2:= ) +" +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + lapack? ( virtual/pkgconfig ) +" + +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() { + # odr violations + filter-lto + + # Similar case to https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1361 + # spmat.cpp:1137: FAILED: + # REQUIRE( c(1, 0) == d(1, 0) ) + #with expansion: + # 0 == -0.0 + append-flags -ffp-contract=on + + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + # bug #902451 + # config.hpp is supposed to define -DARMA_USE_*. but this header isnt included consistently... + append-cppflags -DARMA_USE_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)" + ) + # bug #902451 + append-cppflags -DARMA_USE_BLAS + else + mycmakeargs+=( + -DBLAS_FOUND=OFF + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + # bug #902451 + append-cppflags -DARMA_USE_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//')" + ) + # bug #902451 + append-cppflags -DARMA_USE_SUPERLU + else + mycmakeargs+=( + -DSuperLU_FOUND=OFF + ) + fi + + cmake_src_configure +} + +src_test() { + cmake_src_test || die + + pushd tests2 > /dev/null + emake \ + CXX="$(tc-getCXX)" \ + CXX_FLAGS="-I../include ${CXXFLAGS} ${CPPFLAGS}" \ + LIB_FLAGS="-L${BUILD_DIR} -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack) $($(tc-getPKG_CONFIG) --libs superlu) $($(tc-getPKG_CONFIG) --libs arpack)" + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" ./main || die + emake clean + popd > /dev/null +} + +src_install() { + cmake_src_install + + dodoc README.md + use doc && dodoc *pdf *html + + if use examples; then + docinto examples + dodoc -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi +}