user/dotnet8-build: upgrade to 8.0.100_pre2
This commit is contained in:
parent
c88cd6c66a
commit
ba7c5df329
3 changed files with 76 additions and 90 deletions
|
|
@ -2,19 +2,20 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=dotnet8-build
|
||||
pkgver=8.0.100_pre1
|
||||
pkgrel=1
|
||||
_gittag=v8.0.100-preview.1
|
||||
pkgver=8.0.100_pre2
|
||||
pkgrel=0
|
||||
_gittag=v8.0.100-preview.2
|
||||
_giturl="https://github.com/dotnet/dotnet"
|
||||
_testtag=16c3c04f3ae6620a474fa0474e8b298190e506c1
|
||||
_bunnytag=v12
|
||||
_stage0ver=8.0.100_pre2-r0
|
||||
_patches="
|
||||
build_enable-timestamps.patch
|
||||
check_rid-alpine-generation.diff
|
||||
roslyn-analyzer_disable-apphost.patch
|
||||
runtime_79856-save-errno-when-using-posix-semaphores.patch
|
||||
runtime_82173-add-cmake-check-for-ioclt-prototype.patch
|
||||
runtime_82676-make-pal-console-c-use-int.patch
|
||||
runtime_82678-add-stub-for-mini-is-gsharedvt-inst.patch
|
||||
runtime_enable-system-libunwind.diff
|
||||
runtime_mono-thread-coop-undefine-fortify-source.patch
|
||||
sdk_14239-add-zsh-compdef-completion-script.patch
|
||||
|
|
@ -56,9 +57,9 @@ makedepends="
|
|||
bash
|
||||
clang
|
||||
cmake
|
||||
dotnet$_pkgver_name-stage0-bootstrap
|
||||
dotnet$_pkgver_name-stage0-artifacts
|
||||
dotnet$_pkgver_name-stage0
|
||||
dotnet$_pkgver_name-stage0-bootstrap=$_stage0ver
|
||||
dotnet$_pkgver_name-stage0-artifacts=$_stage0ver
|
||||
dotnet$_pkgver_name-stage0=$_stage0ver
|
||||
findutils
|
||||
git
|
||||
grep
|
||||
|
|
@ -501,15 +502,15 @@ doc() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
f48d4168f526aade888bbd17f2da87f721dabc8ae004707ef9195b6359b79b871115a686678c87542ba74e1d86e5485df13d77ef4d3f4001c0804426aebaf92c dotnet-v8.0.100-preview.1.tar.xz
|
||||
ea01bedda56bd7f2a3a856672ee75a444ad97988631d6dd9b52e513cb333248fff00cdd7f0da5635cf6c7012629bdb8cc44fc5b49a0e8bea4e1421cc1dec4244 dotnet-v8.0.100-preview.2.tar.xz
|
||||
81428356e4b9691c54cacd242368a42d3939732918a608c2a5ae3f23fff45af2d9e981ead70a977f34f4e498c422f708e523bfbbf590cfdafb5c16ef1f0fed8a dotnet-testsuite-16c3c04f3ae6620a474fa0474e8b298190e506c1.tar.gz
|
||||
0028d5d97b814b122d73137b4e0d64ca5d788aa0ae5fde500de722e23522827f2538f06e75acb17cc39b8917961ee78d1f0bbc84b2b624ae0e9bf88adca2ba6f dotnet-bunny-v12.tar.gz
|
||||
eed7a7481a967f6938de956a6df485efa6dd61bf36ae4a768493cb1f7da0296dc91e0f2f89f7c302083ba9cf0c778e28228ec1b52e902077a00072d7d9957ef3 build_enable-timestamps.patch
|
||||
941b430b55e323f723bbc5160447f060f40d18ce32e5803ab7dda16bfc60a0f5ec1dccd246e68475d7115ee265a9433824d8a5d997c302531311194a90deeca9 check_rid-alpine-generation.diff
|
||||
4ac92d2d9190a55ee20d3e145a28a6953c98d3eb838c8acfb808b8839316443cb64da4a2c5787df0171fce7ef96ff6381043085ed90c23ec09ce9ac81571e675 roslyn-analyzer_disable-apphost.patch
|
||||
77fa6d9987a7c43725582c9c493e9d4d5965a611a1d795dad4e3d46cd730caced095f994d93f91a131df7fa4b6a7277bcd3d915bae2dcd869559f22076fbc575 runtime_79856-save-errno-when-using-posix-semaphores.patch
|
||||
86e805b5d0d85294b3ac4866dee00b906a35d064e988e5b48591aeabf29e34ddd8fccb4770cf2bd66437ce4f704fdda43a7522baa9f23ad9353ce010f884d1c5 runtime_82173-add-cmake-check-for-ioclt-prototype.patch
|
||||
18f2be488e4d6c667b90f6b6faed12a84f8c5748c6da91a291542e0a9e8b43effc3bba92a6b38da1b2a904466e3e9bd66b01ad0d3f521bd27a067eb362e2add6 runtime_82676-make-pal-console-c-use-int.patch
|
||||
5452b7c5037210fd273476c58fb8bf30ec9f0e6824489808c6d2af82057c5401bbd244a5aa8aa20a0c6ae122dd55a76cda40ccfd7838530fd23b5ad7bbd5550f runtime_82678-add-stub-for-mini-is-gsharedvt-inst.patch
|
||||
293742ab307bef459a21deadcc4ad7c7996cc4b490910a36c2763b8ad25cc8a91c4e03b6290567cd1030f69638d0156c5b6970887858fb091f8482b67356065d runtime_enable-system-libunwind.diff
|
||||
d732df247c721c9f677baabdd7f36dbf4b564814ff64164361065bb1c196b767494a1d39f634eadf01a23032c7b3e64102614b7213065c81096bbf3f8022e6a0 runtime_mono-thread-coop-undefine-fortify-source.patch
|
||||
d1b4ebcbb1a6815fc0ce4c471485c232618e60968a879309fb8336821a9351d2e0028d9f7726c0c041c750b497a0baa47400c78c9ceff550b91b4a6c2816fc41 sdk_14239-add-zsh-compdef-completion-script.patch
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
From 8d085a4867cb28a24a6f87379df7b4eac6f4712d Mon Sep 17 00:00:00 2001
|
||||
Patch-Source: https://github.com/dotnet/runtime/pull/82173
|
||||
From: Adeel <3840695+am11@users.noreply.github.com>
|
||||
Date: Wed, 15 Feb 2023 17:53:20 +0200
|
||||
Subject: [PATCH 1/2] Add cmake check for ioclt prototype
|
||||
|
||||
---
|
||||
src/native/libs/Common/pal_config.h.in | 1 +
|
||||
src/native/libs/System.Native/pal_io.c | 4 ++++
|
||||
src/native/libs/configure.cmake | 7 +++++++
|
||||
3 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/runtime/src/native/libs/Common/pal_config.h.in b/src/runtime/src/native/libs/Common/pal_config.h.in
|
||||
index 7b592d10326f6..a5ce0ce2a46d4 100644
|
||||
--- a/src/runtime/src/native/libs/Common/pal_config.h.in
|
||||
+++ b/src/runtime/src/native/libs/Common/pal_config.h.in
|
||||
@@ -43,6 +43,7 @@
|
||||
#cmakedefine01 PRIORITY_REQUIRES_INT_WHO
|
||||
#cmakedefine01 KEVENT_REQUIRES_INT_PARAMS
|
||||
#cmakedefine01 HAVE_IOCTL
|
||||
+#cmakedefine01 HAVE_IOCTL_WITH_INT_REQUEST
|
||||
#cmakedefine01 HAVE_TIOCGWINSZ
|
||||
#cmakedefine01 HAVE_TIOCSWINSZ
|
||||
#cmakedefine01 HAVE_SCHED_GETAFFINITY
|
||||
diff --git a/src/runtime/src/native/libs/System.Native/pal_io.c b/src/runtime/src/native/libs/System.Native/pal_io.c
|
||||
index 22fcf3a4f7691..b89bbbbeeaf4b 100644
|
||||
--- a/src/runtime/src/native/libs/System.Native/pal_io.c
|
||||
+++ b/src/runtime/src/native/libs/System.Native/pal_io.c
|
||||
@@ -1325,7 +1325,11 @@ int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd, int64_t
|
||||
// Try copying data using a copy-on-write clone. This shares storage between the files.
|
||||
if (sourceLength != 0)
|
||||
{
|
||||
+#if HAVE_IOCTL_WITH_INT_REQUEST
|
||||
while ((ret = ioctl(outFd, (int)FICLONE, inFd)) < 0 && errno == EINTR);
|
||||
+#elif
|
||||
+ while ((ret = ioctl(outFd, FICLONE, inFd)) < 0 && errno == EINTR);
|
||||
+#endif
|
||||
copied = ret == 0;
|
||||
}
|
||||
#endif
|
||||
diff --git a/src/runtime/src/native/libs/configure.cmake b/src/runtime/src/native/libs/configure.cmake
|
||||
index 0b86bd6df64ed..cbaac692f2630 100644
|
||||
--- a/src/runtime/src/native/libs/configure.cmake
|
||||
+++ b/src/runtime/src/native/libs/configure.cmake
|
||||
@@ -790,6 +790,13 @@ check_prototype_definition(
|
||||
${STATFS_INCLUDES}
|
||||
HAVE_NON_LEGACY_STATFS)
|
||||
|
||||
+check_prototype_definition(
|
||||
+ ioctl
|
||||
+ "int ioctl(int fd, int request, ...)"
|
||||
+ 0
|
||||
+ "sys/ioctl.h"
|
||||
+ HAVE_IOCTL_WITH_INT_REQUEST)
|
||||
+
|
||||
check_c_source_compiles(
|
||||
"
|
||||
#include <stdlib.h>
|
||||
|
||||
From 349e0494a215a372538f6671d6f671c18f594f53 Mon Sep 17 00:00:00 2001
|
||||
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
|
||||
Date: Wed, 15 Feb 2023 18:07:42 +0200
|
||||
Subject: [PATCH 2/2] .
|
||||
|
||||
---
|
||||
src/native/libs/System.Native/pal_io.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/runtime/src/native/libs/System.Native/pal_io.c b/src/runtime/src/native/libs/System.Native/pal_io.c
|
||||
index b89bbbbeeaf4b..7551b426d0b84 100644
|
||||
--- a/src/runtime/src/native/libs/System.Native/pal_io.c
|
||||
+++ b/src/runtime/src/native/libs/System.Native/pal_io.c
|
||||
@@ -1327,7 +1327,7 @@ int32_t SystemNative_CopyFile(intptr_t sourceFd, intptr_t destinationFd, int64_t
|
||||
{
|
||||
#if HAVE_IOCTL_WITH_INT_REQUEST
|
||||
while ((ret = ioctl(outFd, (int)FICLONE, inFd)) < 0 && errno == EINTR);
|
||||
-#elif
|
||||
+#else
|
||||
while ((ret = ioctl(outFd, FICLONE, inFd)) < 0 && errno == EINTR);
|
||||
#endif
|
||||
copied = ret == 0;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
From 30a1cfa37f87fc1100022ca82b833f3f486e84bb Mon Sep 17 00:00:00 2001
|
||||
Patch-Source: https://github.com/dotnet/runtime/pull/82678
|
||||
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
|
||||
Date: Sat, 25 Feb 2023 23:32:43 +0200
|
||||
Subject: [PATCH 1/2] Add guard around mini_is_gsharedvt_inst call
|
||||
|
||||
---
|
||||
src/mono/mono/mini/aot-runtime.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/runtime/src/mono/mono/mini/aot-runtime.c b/src/runtime/src/mono/mono/mini/aot-runtime.c
|
||||
index 683fee00852e7..edc401a5fada2 100644
|
||||
--- a/src/runtime/src/mono/mono/mini/aot-runtime.c
|
||||
+++ b/src/runtime/src/mono/mono/mini/aot-runtime.c
|
||||
@@ -4530,8 +4530,10 @@ mono_aot_can_dedup (MonoMethod *method)
|
||||
!mini_is_gsharedvt_signature (mono_method_signature_internal (method)) &&
|
||||
!mini_is_gsharedvt_klass (method->klass)) {
|
||||
MonoGenericContext *context = mono_method_get_context (method);
|
||||
+#ifdef MONO_ARCH_GSHAREDVT_SUPPORTED
|
||||
if (context->method_inst && mini_is_gsharedvt_inst (context->method_inst))
|
||||
return FALSE;
|
||||
+#endif
|
||||
/* No point in dedup-ing private instances */
|
||||
if ((context->class_inst && inst_is_private (context->class_inst)) ||
|
||||
(context->method_inst && inst_is_private (context->method_inst)))
|
||||
|
||||
From f8f685624d361a76bb425f91c2ab2558dd67ace6 Mon Sep 17 00:00:00 2001
|
||||
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
|
||||
Date: Sun, 26 Feb 2023 06:22:08 +0200
|
||||
Subject: [PATCH 2/2] Add stub for mini_is_gsharedvt_inst
|
||||
|
||||
---
|
||||
src/mono/mono/mini/aot-runtime.c | 2 --
|
||||
src/mono/mono/mini/mini-generic-sharing.c | 6 ++++++
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/runtime/src/mono/mono/mini/aot-runtime.c b/src/runtime/src/mono/mono/mini/aot-runtime.c
|
||||
index edc401a5fada2..683fee00852e7 100644
|
||||
--- a/src/runtime/src/mono/mono/mini/aot-runtime.c
|
||||
+++ b/src/runtime/src/mono/mono/mini/aot-runtime.c
|
||||
@@ -4530,10 +4530,8 @@ mono_aot_can_dedup (MonoMethod *method)
|
||||
!mini_is_gsharedvt_signature (mono_method_signature_internal (method)) &&
|
||||
!mini_is_gsharedvt_klass (method->klass)) {
|
||||
MonoGenericContext *context = mono_method_get_context (method);
|
||||
-#ifdef MONO_ARCH_GSHAREDVT_SUPPORTED
|
||||
if (context->method_inst && mini_is_gsharedvt_inst (context->method_inst))
|
||||
return FALSE;
|
||||
-#endif
|
||||
/* No point in dedup-ing private instances */
|
||||
if ((context->class_inst && inst_is_private (context->class_inst)) ||
|
||||
(context->method_inst && inst_is_private (context->method_inst)))
|
||||
diff --git a/src/runtime/src/mono/mono/mini/mini-generic-sharing.c b/src/runtime/src/mono/mono/mini/mini-generic-sharing.c
|
||||
index 6b81872c4f307..3f4823477e115 100644
|
||||
--- a/src/runtime/src/mono/mono/mini/mini-generic-sharing.c
|
||||
+++ b/src/runtime/src/mono/mono/mini/mini-generic-sharing.c
|
||||
@@ -4859,4 +4859,10 @@ mini_method_to_shared (MonoMethod *method)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+gboolean
|
||||
+mini_is_gsharedvt_inst (MonoGenericInst *inst)
|
||||
+{
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
#endif /* !MONO_ARCH_GSHAREDVT_SUPPORTED */
|
||||
Loading…
Reference in a new issue