Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Nov 2021 20:56:12 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9e02e52115e4 - main - lang/mono6.8: Fix build on current with _WITH_CPU_SET_T
Message-ID:  <202111292056.1ATKuCvJ081280@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e02e52115e43c5c5ec3d971c9100c3cf322b726

commit 9e02e52115e43c5c5ec3d971c9100c3cf322b726
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-11-28 20:56:45 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-11-29 20:55:19 +0000

    lang/mono6.8: Fix build on current with _WITH_CPU_SET_T
    
    Fix the same error as lang/mono.
    
    MFH after:      3 days
---
 lang/mono6.8/files/patch-mono_mini_driver.c        | 21 +++++++++++++++++++++
 lang/mono6.8/files/patch-mono_utils_mono-proclib.c | 10 ++++++++++
 2 files changed, 31 insertions(+)

diff --git a/lang/mono6.8/files/patch-mono_mini_driver.c b/lang/mono6.8/files/patch-mono_mini_driver.c
new file mode 100644
index 000000000000..b3601c0d082f
--- /dev/null
+++ b/lang/mono6.8/files/patch-mono_mini_driver.c
@@ -0,0 +1,21 @@
+--- mono/mini/driver.c.orig	2018-08-24 08:17:13.000000000 -0700
++++ mono/mini/driver.c	2021-11-27 20:03:33.006998000 -0800
+@@ -16,6 +16,8 @@
+ #include <signal.h>
+ #endif
+ #if HAVE_SCHED_SETAFFINITY
++#include <sys/param.h>
++#define _WITH_CPU_SET_T
+ #include <sched.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+@@ -1652,6 +1654,9 @@
+ #if HAVE_SCHED_SETAFFINITY
+ 	if (!use_smp) {
+ 		unsigned long proc_mask = 1;
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 1400042
++#undef GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY
++#endif
+ #ifdef GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY
+ 		sched_setaffinity (getpid(), (gpointer)&proc_mask);
+ #else
diff --git a/lang/mono6.8/files/patch-mono_utils_mono-proclib.c b/lang/mono6.8/files/patch-mono_utils_mono-proclib.c
new file mode 100644
index 000000000000..94221193c985
--- /dev/null
+++ b/lang/mono6.8/files/patch-mono_utils_mono-proclib.c
@@ -0,0 +1,10 @@
+--- mono/utils/mono-proclib.c.orig	2018-08-24 08:17:13.000000000 -0700
++++ mono/utils/mono-proclib.c	2021-11-27 14:55:20.354869000 -0800
+@@ -17,6 +17,7 @@
+ #include <unistd.h>
+ #endif
+ #ifdef HAVE_SCHED_GETAFFINITY
++#define _WITH_CPU_SET_T
+ #include <sched.h>
+ #endif
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111292056.1ATKuCvJ081280>