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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7E1A158090 for ; Fri, 6 May 2022 00:36:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31FB8E08CE; Fri, 6 May 2022 00:36:21 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14842E08CE for ; Fri, 6 May 2022 00:36:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 294703416D8 for ; Fri, 6 May 2022 00:36:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 562D4462 for ; Fri, 6 May 2022 00:36:17 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1651796321.26626b7283d6a04121ab5ef8495d3527a2600cbd.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/mlpack/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild X-VCS-Directories: sci-libs/mlpack/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: 26626b7283d6a04121ab5ef8495d3527a2600cbd X-VCS-Branch: dev Date: Fri, 6 May 2022 00:36: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 196105b1-8eba-4c90-b398-dfbaf725e409 X-Archives-Hash: 4cb012f340a1647245dade1817f518c8 commit: 26626b7283d6a04121ab5ef8495d3527a2600cbd Author: Alessandro Barbieri gmail com> AuthorDate: Fri May 6 00:18:41 2022 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Fri May 6 00:18:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=26626b72 sci-libs/mlpack: buld tests, system catch Closes: https://bugs.gentoo.org/842801 Signed-off-by: Alessandro Barbieri gmail.com> sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild b/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild index 8c4e12677..5073d26cc 100644 --- a/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild +++ b/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild @@ -84,6 +84,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} R? ( dev-R/pkgbuild ) + test? ( dev-cpp/catch:0 ) " BDEPEND=" app-arch/unzip @@ -111,6 +112,7 @@ src_unpack() { } src_prepare() { + rm src/mlpack/tests/catch.hpp rm -r src/mlpack/core/std_backport || die rm -r src/mlpack/core/cereal/{pair_associative_container,unordered_map}.hpp || die @@ -121,12 +123,9 @@ src_prepare() { cmake_src_prepare } -src_compile() { - cmake_src_compile -} - src_configure() { use R && append-cxxflags "-larmadillo" + append-cxxflags "-I/usr/include/catch2" local mycmakeargs=( -DBUILD_CLI_EXECUTABLES=ON @@ -158,6 +157,11 @@ src_configure() { cmake_src_configure } +src_compile() { + cmake_src_compile + use test && cmake_src_compile mlpack_test +} + src_install() { cmake_src_install