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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B31B915812D for ; Mon, 06 Jan 2025 01:00:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 438BFE07BA; Mon, 06 Jan 2025 01:00:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 F120BE07AE for ; Mon, 06 Jan 2025 01:00:08 +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 206B434134D for ; Mon, 06 Jan 2025 01:00:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 774C619DA for ; Mon, 06 Jan 2025 01:00:06 +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: <1736125143.b04d1b46bc11a37cdbf937b5771ae31840afd392.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/flann/flann-1.9.2.ebuild X-VCS-Directories: sci-libs/flann/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b04d1b46bc11a37cdbf937b5771ae31840afd392 X-VCS-Branch: master Date: Mon, 06 Jan 2025 01:00:06 +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: a19873f3-88bd-4c4f-b646-5f413c00d3a0 X-Archives-Hash: caa8af90ed9f336756a8272ae66bdbe7 commit: b04d1b46bc11a37cdbf937b5771ae31840afd392 Author: Paul Zander gmail com> AuthorDate: Mon Jan 6 00:53:55 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 6 00:59:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04d1b46 sci-libs/flann: #947570 Closes: https://bugs.gentoo.org/947570 Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> sci-libs/flann/flann-1.9.2.ebuild | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sci-libs/flann/flann-1.9.2.ebuild b/sci-libs/flann/flann-1.9.2.ebuild index ed7fd815459d..f08ec70da1b4 100644 --- a/sci-libs/flann/flann-1.9.2.ebuild +++ b/sci-libs/flann/flann-1.9.2.ebuild @@ -34,10 +34,6 @@ RDEPEND="${DEPEND}" # requires multiple ruby dependencies PATCHES=( - # "${FILESDIR}"/${PN}-1.9.1-cmake-3.11{,-1}.patch # bug 678030 - # "${FILESDIR}"/${PN}-1.9.1-cuda-9.patch - # "${FILESDIR}"/${PN}-1.9.1-system-lz4.patch # bug 681898 - # "${FILESDIR}"/${PN}-1.9.1-system-lz4-pkgconfig.patch # bug 827263 "${FILESDIR}"/${PN}-1.9.1-build-oct-rather-than-mex-files-for-octave.patch # bug 830424 "${FILESDIR}"/${PN}-1.9.2-asio-boost187.patch "${FILESDIR}"/${PN}-1.9.2-boost-config.patch @@ -61,14 +57,11 @@ src_prepare() { } src_configure() { - # append-cxxflags -std=c++17 - # python bindings are split off into dev-python/pyflann local mycmakeargs=( -DCMAKE_CXX_STANDARD=17 -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF - -DPYTHON_EXECUTABLE=python3.12 -DBUILD_CUDA_LIB="$(usex cuda)" -DBUILD_EXAMPLES="$(usex examples)" -DBUILD_DOC="$(usex doc)" @@ -81,7 +74,7 @@ src_configure() { # einfo "NVCCFLAGS ${NVCCFLAGS}" use cuda && mycmakeargs+=( # -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - -DCUDA_NVCC_FLAGS="-ccbin /usr/x86_64-pc-linux-gnu/gcc-bin/13/g++" + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" ) use doc && mycmakeargs+=( -DDOCDIR="share/doc/${PF}" ) @@ -92,7 +85,7 @@ src_install() { cmake_src_install find "${ED}" -name 'lib*.a' -delete || die - # bug 795828; mpicc volunterely adds some runpaths + # bug 795828; mpicc voluntarily adds some runpaths if use mpi; then chrpath -d "${ED}/usr/bin/flann_mpi_"{client,server} || die fi