diff --git a/community/dotnet7-build/APKBUILD b/community/dotnet7-build/APKBUILD index 3c3e163b6b0..912f4fff76a 100644 --- a/community/dotnet7-build/APKBUILD +++ b/community/dotnet7-build/APKBUILD @@ -2,9 +2,9 @@ # Contributor: Antoine Martin (ayakael) pkgname=dotnet7-build -pkgver=7.0.101 +pkgver=7.0.102 pkgrel=0 -_gittag=v7.0.101-source-build +_gittag=v7.0.102 _giturl="https://github.com/dotnet/installer" _testtag=16c3c04f3ae6620a474fa0474e8b298190e506c1 _bunnytag=v12 @@ -75,6 +75,7 @@ makedepends=" llvm-dev lttng-ust-dev nodejs + numactl-dev openssl-dev pigz rsync @@ -260,24 +261,12 @@ build() { /p:CleanWhileBuilding=true " - # Shim flag until upstream is comfortable with completely eliminating portable build - # might break build with stage0 as it forces usage of non-portable packages - local args="$args /p:UseNonPortableIlasmPackageOverride=true" - # part of https://github.com/dotnet/installer/pull/14792 that sets this flag # was not integrated in 7.0.1xx yet case $CARCH in s390x|ppc64le) local args="$args /p:SourceBuildUseMonoRuntime=true";; esac - # Parallel restore is broken on mono-based builds since dotnet7 - # see https://github.com/dotnet/runtime/issues/77364 - # A workaround via runtime_enable-runtime-marshalling.diff - # removes the error, but env var is added in case we build with stage0 - case $CARCH in - s390x|ppc64le) export RestoreDisableParallel=true CopyRetryCount=10;; - esac - # Sets TargetRid manually as dotnet cannot be trusted to reliably compute # the machine's runtime ID between releases. # shellcheck disable=SC2034 @@ -368,7 +357,7 @@ package() { # directory creation install -dm 755 \ "$pkgdir"/$_libdir/dotnet/bootstrap/$pkgver \ - "$pkgdir"/usr/share/man/man1/dotnet \ + "$pkgdir"/usr/share/man/man1 \ "$pkgdir"/$_libdir/dotnet/artifacts/$pkgver # unpack sdk to bootstrap @@ -386,7 +375,7 @@ package() { '*alpine*' # assemble docs - find "$builddir" -iname 'dotnet*.1' -type f -exec cp '{}' "$pkgdir"/usr/share/man/man1/dotnet/. \; + find "$builddir" -iname 'dotnet*.1' -type f -exec cp '{}' "$pkgdir"/usr/share/man/man1/. \; # some files either should or should not have executable bits _fix_executable "$pkgdir" @@ -522,7 +511,7 @@ doc() { } sha512sums=" -5256c5467de0d92e1c78e80a3c571ba842bff3ab487e88061dfebfde1b8052c37263369e379dfd762194409d2bd31692bdfe6fc2ba2622530c5c6695aff1fbb1 dotnet-v7.0.101-source-build.tar.xz +7a2f167b78f5b10844ad113cf6773f9eab6df8532bff899265ce5eccf2785b2665e455a01af8c29168dc4fc2f98768729ce814d649acb47da258e112cf25d29b dotnet-v7.0.102.tar.xz 81428356e4b9691c54cacd242368a42d3939732918a608c2a5ae3f23fff45af2d9e981ead70a977f34f4e498c422f708e523bfbbf590cfdafb5c16ef1f0fed8a dotnet-testsuite-16c3c04f3ae6620a474fa0474e8b298190e506c1.tar.gz 0028d5d97b814b122d73137b4e0d64ca5d788aa0ae5fde500de722e23522827f2538f06e75acb17cc39b8917961ee78d1f0bbc84b2b624ae0e9bf88adca2ba6f dotnet-bunny-v12.tar.gz 24a018e9c338b38334e083fc3875b0b2a0ed277078cd3b1cd8bc923dfa5f728fb900941bc2039e1be27a0a0686d53c9025dde11a80ea2407e6ae0238357d46b1 build_15039-set-nativeaotsupported-as-false-on-arm.patch @@ -533,7 +522,7 @@ sha512sums=" 4ac92d2d9190a55ee20d3e145a28a6953c98d3eb838c8acfb808b8839316443cb64da4a2c5787df0171fce7ef96ff6381043085ed90c23ec09ce9ac81571e675 roslyn-analyzer_disable-apphost.patch 7a3291a05c94986d631a37870f573aca8603e9464cb632b3e5b93eca8a358fc7dcc98a8a8017f566885ceafe462bec734b7d31c7a974270e83c6d2ae54f51902 runtime_76500-mono-musl-support.patch 218e26f752de0e1dbb7a62b142a894cfda9a8a59d09c60525039dd7d99847dd17f181ef8ff2b6ad9ce74001ad771c78093c61c8882de58f16070d74be36b2765 runtime_enable-runtime-marshalling.diff -5f10922ae2aa93776372455dcd0c164ba5662321139fa45936a8525fdbd91993b464ca5364edbdbc698647963888f68163aa299fe79be8f4b586c22a8f5d2450 runtime_enable-system-libunwind.diff +293742ab307bef459a21deadcc4ad7c7996cc4b490910a36c2763b8ad25cc8a91c4e03b6290567cd1030f69638d0156c5b6970887858fb091f8482b67356065d runtime_enable-system-libunwind.diff d1b4ebcbb1a6815fc0ce4c471485c232618e60968a879309fb8336821a9351d2e0028d9f7726c0c041c750b497a0baa47400c78c9ceff550b91b4a6c2816fc41 sdk_14239-add-zsh-compdef-completion-script.patch 9aad6bd948787eb976e77a248bbdcc66695c25d1b67617fee02661e688dfa84b989dd7e768e9b717a6fc5d4d423e1e139e779bd16b46cffdcf057659cee70186 sdk_28674-support-building-with-mono-runtime.patch " diff --git a/community/dotnet7-build/runtime_enable-system-libunwind.diff b/community/dotnet7-build/runtime_enable-system-libunwind.diff index 78e2f53f798..69045ad044a 100644 --- a/community/dotnet7-build/runtime_enable-system-libunwind.diff +++ b/community/dotnet7-build/runtime_enable-system-libunwind.diff @@ -1,11 +1,11 @@ diff --git a/src/runtime/eng/SourceBuild.props b/src/runtime/eng/SourceBuild.props -index f595e9b7d1..d90fd47dbd 100644 +index 32e6d9c0ba..8e2a7f9931 100644 --- a/src/runtime/eng/SourceBuild.props +++ b/src/runtime/eng/SourceBuild.props -@@ -52,6 +52,7 @@ +@@ -51,6 +51,7 @@ + $(InnerBuildArgs) /p:DisableSourceLink=false $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono - $(InnerBuildArgs) /p:UseNonPortableIlasmPackageOverride=true + $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE