• [gentoo-dev] [PATCH 1/3] eclass/dotnet-pkg-base.eclass: remove DOTNET_P

    From =?UTF-8?q?Maciej=20Bar=C4=87?=@21:1/5 to All on Sun Nov 5 00:20:01 2023
    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
  • From =?UTF-8?q?Maciej=20Bar=C4=87?=@21:1/5 to All on Sun Nov 5 00:20:01 2023
    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 @@ e
  • From =?UTF-8?q?Maciej=20Bar=C4=87?=@21:1/5 to All on Sun Nov 5 00:20:01 2023
    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

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)