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 04DF4158089 for ; Sat, 4 Nov 2023 23:15:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D67412BC01D; Sat, 4 Nov 2023 23:14:59 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80E082BC016 for ; Sat, 4 Nov 2023 23:14:59 +0000 (UTC) From: =?UTF-8?q?Maciej=20Bar=C4=87?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Maciej=20Bar=C4=87?= Subject: [gentoo-dev] [PATCH 1/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_PKG_EXECUTABLE_PATH Date: Sun, 5 Nov 2023 00:13:51 +0100 Message-ID: <20231104231416.48547-1-xgqt@gentoo.org> X-Mailer: git-send-email 2.41.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: f87f084b-fd91-48a0-a780-085d13f470be X-Archives-Hash: 737ab11c74c3d254a5ee3e0a529750e4 Signed-off-by: Maciej Barć --- eclass/dotnet-pkg-base.eclass | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eclass/dotnet-pkg-base.eclass b/eclass/dotnet-pkg-base.eclass index 5b2d6e2dd..35beacfeb 100644 --- a/eclass/dotnet-pkg-base.eclass +++ b/eclass/dotnet-pkg-base.eclass @@ -222,20 +222,18 @@ dotnet-pkg-base_setup() { dotnet_compat_impl_path="$(type -P "${dotnet_compat_impl}")" if [[ -n ${dotnet_compat_impl_path} ]] ; then - DOTNET_PKG_EXECUTABLE=${dotnet_compat_impl} - DOTNET_PKG_EXECUTABLE_PATH="${dotnet_compat_impl_path}" - + DOTNET_PKG_EXECUTABLE="${dotnet_compat_impl}" break fi done # Link "DOTNET_PKG_EXECUTABLE" to "dotnet" only for the package build. - local dotnet_spoof_path="${T}"/dotnet_spoof/${DOTNET_PKG_COMPAT} + local dotnet_spoof_path="${T}/dotnet_spoof/${DOTNET_PKG_COMPAT}" mkdir -p "${dotnet_spoof_path}" || die - ln -s "${DOTNET_PKG_EXECUTABLE_PATH}" "${dotnet_spoof_path}"/dotnet || die + ln -s "${dotnet_compat_impl_path}" "${dotnet_spoof_path}/dotnet" || die export PATH="${dotnet_spoof_path}:${PATH}" - einfo "Using dotnet SDK \"${DOTNET_PKG_EXECUTABLE}\" from \"${DOTNET_PKG_EXECUTABLE_PATH}\"." + einfo "Using dotnet SDK \"${DOTNET_PKG_EXECUTABLE}\" from \"${dotnet_compat_impl_path}\"." # The picked "DOTNET_PKG_EXECUTABLE" should set "DOTNET_ROOT" internally # and not rely upon this environment variable. -- 2.41.0