From nobody Mon Nov 29 20:56:12 2021 X-Original-To: dev-commits-ports-main@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 DA0EB18C607C; Mon, 29 Nov 2021 20:56:14 +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 4J2yLj0sbYz4cD5; Mon, 29 Nov 2021 20:56:12 +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 3C3B31624; Mon, 29 Nov 2021 20:56:12 +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 1ATKuCcM081281; Mon, 29 Nov 2021 20:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATKuCvJ081280; Mon, 29 Nov 2021 20:56:12 GMT (envelope-from git) Date: Mon, 29 Nov 2021 20:56:12 GMT Message-Id: <202111292056.1ATKuCvJ081280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 9e02e52115e4 - main - lang/mono6.8: Fix build on current with _WITH_CPU_SET_T List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 9e02e52115e43c5c5ec3d971c9100c3cf322b726 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638219373; 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=y23q2pE4qg9viRgSuJenTM7Q1n8C9MVBByWaETb5XUQ=; b=s0cc/BRzw4utb1zEdgQ0rnyikDftmIxNJ00LxqWZGsaEBr9eWxQ2kky18qosOAjXmAQOlz WLtQq48d0I9I3IpRq3DmSn6ivR49fWXSECqqHDAJy9jE7RzDL8yUSlQfrNZpbdDQMEl+tW xyzseRK4oUEqNhddnYhLZ5NhWwmzANETY8G87xtVVv3vszU8piVkynI7RXAdkRXslDW6Cg ncXAEeaihXFhqK9mRvwMJtfQoictIHYcdzWgO29x0OHO/InNBzH5XQTrGeQeNdQlUNGR2S E8hG0GTXEg5wikM4OlH9FOlPgHjTCZ+PGB5ZouQIQmzQgvHgFwwlGIM8xW6LRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638219373; a=rsa-sha256; cv=none; b=vfCdzLVNeq9BzSu86OVvTwkvslyCpFx8bL4OUitvWpkIOZ3K9sgit1fYksGtUB0DMotdyB EVet92ozR3Xq/onIPpiCIXRFQ3HC+nb25nToo+6nTC95E4sHzmRRYLmMtDmxLqA7cXPAXS 5uuawW9hYjcFnqMJP8ZtgBFIdentkNAuNzQPMXVUucZvBj0SVQBROSOJ5itzoywVxjFTvM YcXMTfV7bj0BgIpDH5MJvtZbWvtGWk2EhG3s8S1zfVKx3T1z1snc4RKSTpESsAjckfrnWs wTnjHEnlSCZQdcFO52IFz3GyqaagMbjKzs58y0zuzjVCGoiRkem3wCuge5OJvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e02e52115e43c5c5ec3d971c9100c3cf322b726 commit 9e02e52115e43c5c5ec3d971c9100c3cf322b726 Author: Cy Schubert AuthorDate: 2021-11-28 20:56:45 +0000 Commit: Cy Schubert 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 + #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/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 + #endif + #ifdef HAVE_SCHED_GETAFFINITY ++#define _WITH_CPU_SET_T + #include + #endif +