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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F24671584AD for ; Thu, 08 May 2025 06:29:50 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DF2253430C8 for ; Thu, 08 May 2025 06:29:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9957D110497; Thu, 08 May 2025 06:29:37 +0000 (UTC) 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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 86CF0110497 for ; Thu, 08 May 2025 06:29:37 +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 43D863430C8 for ; Thu, 08 May 2025 06:29:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED716288A for ; Thu, 08 May 2025 06:29:34 +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: <1746685608.7879e8cd60471f3319f12abc27d45fcdfdcec6ef.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-4.10.0.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7879e8cd60471f3319f12abc27d45fcdfdcec6ef X-VCS-Branch: master Date: Thu, 08 May 2025 06:29:34 +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: eb3bcfa5-9b77-446b-88fb-62759bc3de4a X-Archives-Hash: a50da974e3cf0790a2263bf741252a3c commit: 7879e8cd60471f3319f12abc27d45fcdfdcec6ef Author: Paul Zander gmail com> AuthorDate: Fri May 2 19:04:03 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 8 06:26:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7879e8cd media-libs/opencv: respect CUDA vars `local -x ` unsets the already set option... Signed-off-by: Paul Zander gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41967 Signed-off-by: Sam James gentoo.org> media-libs/opencv/opencv-4.10.0.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index 59d751cc4e9d..31035e61e328 100644 --- a/media-libs/opencv/opencv-4.10.0.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -367,7 +367,6 @@ cuda_get_host_compiler() { local compiler compiler_type compiler_version local package package_version - local -x NVCC_CCBIN local NVCC_CCBIN_default compiler_type="$(tc-get-compiler-type)" @@ -648,7 +647,7 @@ multilib_src_configure() { # NOTE set this via MYCMAKEARGS if needed -DWITH_NVCUVID="no" # TODO needs NVIDIA Video Codec SDK -DWITH_NVCUVENC="no" # TODO needs NVIDIA Video Codec SDK - -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${CUDA_PATH:=${EPREFIX}/opt/cuda}" "")" + -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${CUDA_PATH:-${ESYSROOT}/opt/cuda}" "")" # =================================================== # OpenCV build components # =================================================== @@ -857,8 +856,8 @@ multilib_src_configure() { ) fi else - local -x CUDAARCHS : "${CUDAARCHS:="$(cuda_get_host_native_arch)"}" + export CUDAARCHS fi local -x CUDAHOSTCXX CUDAHOSTLD