From nobody Fri Dec 10 04:41:57 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D321418DD1BB; Fri, 10 Dec 2021 04:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9JCT3d0gz3NnL; Fri, 10 Dec 2021 04:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CE0314261; Fri, 10 Dec 2021 04:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BA4fvMr035707; Fri, 10 Dec 2021 04:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4fv8w035706; Fri, 10 Dec 2021 04:41:57 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:41:57 GMT Message-Id: <202112100441.1BA4fv8w035706@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 37eafb5a8063 - 2021Q4 - lang/mono: Fix build on current with _WITH_CPU_SET_T List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 37eafb5a80635f375ff4f28d0df802ab66639afe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a1QFVa6V43bi4U6l00dar9T0baSLOY18YPdSgc3XOdA=; b=RdtN1yNWFerPdihyheksDGpWMq7GAYoQZyv7JoytAWWJCdWAi8V8WVydobEiH6vGBppCnX PyyKTEokg0co/8cwJdHSYXFj1nmn0Ob5TW8Kv3QRgukn5nnJ4DkKo24pfhbZBv5ccdsKk5 NHUp0hTIWJ/X1iE2cGzAOUmpeK0KdQmdeRCAkkx4BKCdJjnnnXpQBx+I4lWgZA8V4llzgl q+GgnzU6nReQMv8FhynQOodN3SoxzbqZ+gUJBE0NiGdmZZkaLruhJ9r/pW19FRTibxH1uQ eiqV0uxprQfA/5n2hFVNqekf03WAyDHxD6ck0LGhKjlonkz3Wij5A1aSrzPuyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111317; a=rsa-sha256; cv=none; b=qptjVwrXOIW6+h7ugN7dqoX2nQGkRN/MgOoNhCSqaM5Q1inSpDo/wzbnIf17ODxqzBIUoQ hw0khf6gUces/hTaZANh+90A7hDQ21QxSe2o+iOwENp1HE7ImnQkJro+kNOyjDkyS1SwPX 8SFbfMtMZpTNGF/kzovgzIp81kxHANNm2l5kEVneaFChcGVdhW4stAOEZkDNxF/HdBaiir ugwQMCP1XdjJBSQzT9Dr7c7Aidu9i707oXBBqRu2s5YZOaXbGKZrXkcRhDkglD6hSH7ryI zQYnCJf84NZSA4MUwlwZ+QU9ph4js5eckkWesvZydnQvq5xMqbdXo7vakEfYfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=37eafb5a80635f375ff4f28d0df802ab66639afe commit 37eafb5a80635f375ff4f28d0df802ab66639afe Author: Cy Schubert AuthorDate: 2021-11-28 01:52:24 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:31:03 +0000 lang/mono: Fix build on current with _WITH_CPU_SET_T mono-proclib.c:776:3: error: unknown type name 'cpu_set_t'; did you mean 'cpuset_t'? cpu_set_t set; ^~~~~~~~~ cpuset_t /usr/include/sys/_cpuset.h:50:24: note: 'cpuset_t' declared here typedef struct _cpuset cpuset_t; ^ mono-proclib.c:777:7: error: implicit declaration of function 'sched_getaffinity' is invalid in C99 [-Werror,-Wimplicit-function-declaration] if (sched_getaffinity (mono_process_current_pid (), sizeof (set), &set) == 0) ^ mono-proclib.c:778:11: error: implicit declaration of function 'CPU_COUNT' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return CPU_COUNT (&set); ^ 3 errors generated. (cherry picked from commit 83c19a7238e9f5f46a9186e3ce58d03585691e5d) --- lang/mono/files/patch-mono_mini_driver.c | 21 +++++++++++++++++++++ lang/mono/files/patch-mono_utils_mono-proclib.c | 10 ++++++++++ 2 files changed, 31 insertions(+) diff --git a/lang/mono/files/patch-mono_mini_driver.c b/lang/mono/files/patch-mono_mini_driver.c new file mode 100644 index 000000000000..b3601c0d082f --- /dev/null +++ b/lang/mono/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 + #endif + #if HAVE_SCHED_SETAFFINITY ++#include ++#define _WITH_CPU_SET_T + #include + #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/mono/files/patch-mono_utils_mono-proclib.c b/lang/mono/files/patch-mono_utils_mono-proclib.c new file mode 100644 index 000000000000..94221193c985 --- /dev/null +++ b/lang/mono/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 + #endif + #ifdef HAVE_SCHED_GETAFFINITY ++#define _WITH_CPU_SET_T + #include + #endif +