Skip to content

Commit 08e229c

Browse files
committed
fix(main/dotnet{9.0,10.0}): kill lingering processes after build
1 parent f47906c commit 08e229c

4 files changed

Lines changed: 13 additions & 10 deletions

File tree

packages/dotnet10.0/build.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=git+https://github.com/dotnet/dotnet
88
TERMUX_PKG_GIT_BRANCH="v${_DOTNET_SDK_VERSION}"
99
TERMUX_PKG_BUILD_DEPENDS="krb5, libicu, openssl, zlib"
1010
TERMUX_PKG_SUGGESTS="dotnet-sdk-10.0"
11-
TERMUX_PKG_CONFLICTS="dotnet9.0"
11+
TERMUX_PKG_CONFLICTS="dotnet8.0, dotnet9.0"
1212
TERMUX_PKG_BUILD_IN_SRC=true
1313
TERMUX_PKG_NO_STATICSPLIT=true
1414
TERMUX_PKG_AUTO_UPDATE=true
@@ -194,6 +194,7 @@ termux_step_make() {
194194
termux_error_exit
195195
fi
196196
"${TERMUX_PKG_BUILDDIR}/.dotnet/dotnet" build-server shutdown
197+
termux_dotnet_kill
197198
}
198199

199200
termux_step_make_install() {
@@ -349,16 +350,16 @@ termux_step_make_install() {
349350
\( -type f -o -type l \) | sort \
350351
> "${TERMUX_PKG_TMPDIR}"/dotnet-templates.txt
351352

352-
if [ ! -d lib/dotnet/packs/NETStandard.Library.Ref ]; then
353+
if [[ ! -d lib/dotnet/packs/NETStandard.Library.Ref ]]; then
353354
echo "WARNING: NETStandard.Library.Ref not found in SDK tarball, extracting from nupkg"
354355
local _nupkg
355-
_nupkg=$(find "${TERMUX_PKG_BUILDDIR}/prereqs/packages/reference" \
356-
-iname 'netstandard.library.ref.2.1.0.nupkg' -print -quit 2>/dev/null)
357-
if [ -z "${_nupkg}" ]; then
358-
_nupkg=$(find "${TERMUX_PKG_BUILDDIR}" -maxdepth 5 \
359-
-iname 'netstandard.library.ref.2.1.0.nupkg' -print -quit 2>/dev/null)
356+
_nupkg="$(find "${TERMUX_PKG_BUILDDIR}/prereqs/packages/reference" \
357+
-iname 'netstandard.library.ref.2.1.0.nupkg' -print -quit 2>/dev/null)"
358+
if [[ -z "${_nupkg}" ]]; then
359+
_nupkg="$(find "${TERMUX_PKG_BUILDDIR}" -maxdepth 5 \
360+
-iname 'netstandard.library.ref.2.1.0.nupkg' -print -quit 2>/dev/null)"
360361
fi
361-
if [ -n "${_nupkg}" ]; then
362+
if [[ -n "${_nupkg}" ]]; then
362363
mkdir -p lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
363364
unzip -qo "${_nupkg}" -d lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
364365
rm -rf lib/dotnet/packs/NETStandard.Library.Ref/2.1.0/{_rels,package,'[Content_Types].xml'} \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
TERMUX_SUBPKG_DESCRIPTION=".NET 10.0 Host"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
3-
TERMUX_SUBPKG_CONFLICTS="dotnet-host-9.0"
3+
TERMUX_SUBPKG_CONFLICTS="dotnet-host-8.0, dotnet-host-9.0"
44
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/dotnet-host.txt)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TERMUX_SUBPKG_DESCRIPTION="NETStandard.Library 2.1 Targeting Pack (.NET 10.0)"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
33
TERMUX_SUBPKG_DEPENDS="dotnet-host"
4-
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-9.0"
4+
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-8.0, netstandard-targeting-pack-2.1-9.0"
55
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/netstandard-targeting-pack-2.1.txt)

packages/dotnet9.0/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION=".NET 9.0"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="@truboxl"
55
TERMUX_PKG_VERSION="9.0.12"
6+
TERMUX_PKG_REVISION=1
67
_DOTNET_SDK_VERSION="9.0.113"
78
TERMUX_PKG_SRCURL=git+https://github.com/dotnet/dotnet
89
TERMUX_PKG_GIT_BRANCH="v${_DOTNET_SDK_VERSION}"
@@ -190,6 +191,7 @@ termux_step_make() {
190191
termux_error_exit
191192
fi
192193
"${TERMUX_PKG_BUILDDIR}/.dotnet/dotnet" build-server shutdown
194+
termux_dotnet_kill
193195
}
194196

195197
termux_step_make_install() {

0 commit comments

Comments
 (0)