pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mono6: remove unused args. adjust patch following upstream comment



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Tue Aug 13 06:55:23 2019 +0300
Changeset:	c67967c13c7f080b4945148b49ba5da26b67291c

Modified Files:
	mono6/Makefile
	mono6/distinfo
	mono6/patches/patch-mono_metadata_threads.c

Log Message:
mono6: remove unused args. adjust patch following upstream comment

Need to exit GC in the introduced case.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c67967c13c7f080b4945148b49ba5da26b67291c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mono6/Makefile                              |  3 +--
 mono6/distinfo                              |  2 +-
 mono6/patches/patch-mono_metadata_threads.c | 17 +++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs:
diff --git a/mono6/Makefile b/mono6/Makefile
index 8409d5b927..a2abe724c0 100644
--- a/mono6/Makefile
+++ b/mono6/Makefile
@@ -23,8 +23,7 @@ EXTRACT_USING=	gtar
 
 GNU_CONFIGURE=		yes
 PKG_SYSCONFSUBDIR=	mono
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} --with-icu=yes
-CONFIGURE_ARGS+=	--disable-dtrace
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 USE_CWRAPPERS=		no
 MAKE_FLAGS+=		PERL=${PERL5:Q} mandir=${PREFIX}/${PKGMANDIR}
diff --git a/mono6/distinfo b/mono6/distinfo
index 29997b65aa..1d0dca7847 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -14,7 +14,7 @@ SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7
 SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
 SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 3368edee232b184879091df3d68daf4900f744c2
 SHA1 (patch-mono_metadata_icall.c) = 292c7bc4c959a3a5c1a982ccf2bc26a5300a0730
-SHA1 (patch-mono_metadata_threads.c) = 5b55d0b3b5e506bf08ac14712f44a8db4594b254
+SHA1 (patch-mono_metadata_threads.c) = e1432cced0dafce1a2712869ce79e12a2ab35973
 SHA1 (patch-mono_mini_Makefile.am.in) = 697b0b56d9b7ddb5f61cd105c2c9c5dfac53ed9b
 SHA1 (patch-mono_native_Makefile.am) = 47e57623ebfce32f13a5fc1c19a0dbcb31dad8d4
 SHA1 (patch-mono_native_mono-native-platform.h) = 845c921b4a84146b78f4f94c9380890892f5ff29
diff --git a/mono6/patches/patch-mono_metadata_threads.c b/mono6/patches/patch-mono_metadata_threads.c
index 3c991acc69..8b0a15910e 100644
--- a/mono6/patches/patch-mono_metadata_threads.c
+++ b/mono6/patches/patch-mono_metadata_threads.c
@@ -7,14 +7,15 @@ https://github.com/mono/mono/pull/15898
 
 --- mono/metadata/threads.c.orig	2019-07-18 07:46:08.000000000 +0000
 +++ mono/metadata/threads.c
-@@ -740,6 +740,10 @@ mono_thread_internal_set_priority (MonoI
- #else
- 	min = sched_get_priority_min (policy);
- 	max = sched_get_priority_max (policy);
-+
-+	/* Not tunable. Bail out */
-+	if ((min == -1) || (max == -1))
-+		return;
+@@ -743,6 +743,11 @@ mono_thread_internal_set_priority (MonoI
  #endif
  	MONO_EXIT_GC_SAFE;
  
++	/* Not tunable. Bail out */
++	if ((min == -1) || (max == -1))
++		return;
++
++
+ 	if (max > 0 && min >= 0 && max > min) {
+ 		double srange, drange, sposition, dposition;
+ 		srange = MONO_THREAD_PRIORITY_HIGHEST - MONO_THREAD_PRIORITY_LOWEST;


Home | Main Index | Thread Index | Old Index