* [gentoo-dev] [PATCH 1/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_PKG_EXECUTABLE_PATH
@ 2023-11-04 23:13 Maciej Barć
2023-11-04 23:13 ` [gentoo-dev] [PATCH 2/3] eclass/dotnet-pkg-base.eclass: mark OUTPUT_VARIABLEs Maciej Barć
2023-11-04 23:13 ` [gentoo-dev] [PATCH 3/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_DATA and NUGET_DATA Maciej Barć
0 siblings, 2 replies; 3+ messages in thread
From: Maciej Barć @ 2023-11-04 23:13 UTC (permalink / raw)
To: gentoo-dev; +Cc: Maciej Barć
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH 2/3] eclass/dotnet-pkg-base.eclass: mark OUTPUT_VARIABLEs
2023-11-04 23:13 [gentoo-dev] [PATCH 1/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_PKG_EXECUTABLE_PATH Maciej Barć
@ 2023-11-04 23:13 ` Maciej Barć
2023-11-04 23:13 ` [gentoo-dev] [PATCH 3/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_DATA and NUGET_DATA Maciej Barć
1 sibling, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2023-11-04 23:13 UTC (permalink / raw)
To: gentoo-dev; +Cc: Maciej Barć
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
eclass/dotnet-pkg-base.eclass | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/eclass/dotnet-pkg-base.eclass b/eclass/dotnet-pkg-base.eclass
index 35beacfeb..9b070d9c2 100644
--- a/eclass/dotnet-pkg-base.eclass
+++ b/eclass/dotnet-pkg-base.eclass
@@ -44,6 +44,7 @@ inherit edo multiprocessing nuget
# should be picked by the maintainer.
# @ECLASS_VARIABLE: DOTNET_PKG_RDEPS
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Populated with important dependencies on .NET ecosystem packages for running
# .NET packages.
@@ -52,6 +53,7 @@ inherit edo multiprocessing nuget
DOTNET_PKG_RDEPS=""
# @ECLASS_VARIABLE: DOTNET_PKG_BDEPS
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Populated with important dependencies on .NET ecosystem packages for building
# .NET packages.
@@ -98,6 +100,7 @@ export UseSharedCompilation=false
# @ECLASS_VARIABLE: DOTNET_PKG_RUNTIME
# @DEFAULT_UNSET
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Sets the runtime used to build a package.
#
@@ -105,6 +108,7 @@ export UseSharedCompilation=false
# @ECLASS_VARIABLE: DOTNET_PKG_EXECUTABLE
# @DEFAULT_UNSET
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Sets path of a "dotnet" executable.
#
@@ -112,6 +116,7 @@ export UseSharedCompilation=false
# @ECLASS_VARIABLE: DOTNET_PKG_CONFIGURATION
# @DEFAULT_UNSET
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Configuration value passed to "dotnet" in the compile phase.
# Is either Debug or Release, depending on the "debug" USE flag.
@@ -120,6 +125,7 @@ export UseSharedCompilation=false
# @ECLASS_VARIABLE: DOTNET_PKG_OUTPUT
# @DEFAULT_UNSET
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Path of the output directory, where the package artifacts are placed during
# the building of packages with "dotnet-pkg-base_build" function.
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH 3/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_DATA and NUGET_DATA
2023-11-04 23:13 [gentoo-dev] [PATCH 1/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_PKG_EXECUTABLE_PATH Maciej Barć
2023-11-04 23:13 ` [gentoo-dev] [PATCH 2/3] eclass/dotnet-pkg-base.eclass: mark OUTPUT_VARIABLEs Maciej Barć
@ 2023-11-04 23:13 ` Maciej Barć
1 sibling, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2023-11-04 23:13 UTC (permalink / raw)
To: gentoo-dev; +Cc: Maciej Barć
they do not influence .NET build
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
eclass/dotnet-pkg-base.eclass | 4 ----
1 file changed, 4 deletions(-)
diff --git a/eclass/dotnet-pkg-base.eclass b/eclass/dotnet-pkg-base.eclass
index 9b070d9c2..1a9d31120 100644
--- a/eclass/dotnet-pkg-base.eclass
+++ b/eclass/dotnet-pkg-base.eclass
@@ -245,10 +245,6 @@ dotnet-pkg-base_setup() {
# and not rely upon this environment variable.
unset DOTNET_ROOT
- # Unset .NET and NuGet directories.
- unset DOTNET_DATA
- unset NUGET_DATA
-
DOTNET_PKG_RUNTIME="$(dotnet-pkg-base_get-runtime)"
DOTNET_PKG_CONFIGURATION="$(dotnet-pkg-base_get-configuration)"
DOTNET_PKG_OUTPUT="$(dotnet-pkg-base_get-output "${P}")"
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-04 23:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-04 23:13 [gentoo-dev] [PATCH 1/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_PKG_EXECUTABLE_PATH Maciej Barć
2023-11-04 23:13 ` [gentoo-dev] [PATCH 2/3] eclass/dotnet-pkg-base.eclass: mark OUTPUT_VARIABLEs Maciej Barć
2023-11-04 23:13 ` [gentoo-dev] [PATCH 3/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_DATA and NUGET_DATA Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox