From nobody Fri Dec 10 04:41:59 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 7069218DD1C2; Fri, 10 Dec 2021 04:42:00 +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 4J9JCW6W0Cz3NnS; Fri, 10 Dec 2021 04:41:59 +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 A52CA1435B; Fri, 10 Dec 2021 04:41:59 +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 1BA4fxWJ035764; Fri, 10 Dec 2021 04:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4fxuJ035763; Fri, 10 Dec 2021 04:41:59 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:41:59 GMT Message-Id: <202112100441.1BA4fxuJ035763@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: fb5e4b0e96e4 - 2021Q4 - lang/mono5.20: 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: fb5e4b0e96e4f77f3c6594d1fbc01380facf5902 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111320; 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=7r9rwJFl1PXPF+O0w1en5CvntS0bFh+F/w3G/I78bkQ=; b=EyVucYjDFTgiJQeYC+ExJSX+1F/S6efQgiXhoAyyRTVonvCKxSS5XLoF5Oxms/rDnvwYlY QoPrM+Z7dMcg/vnv7AoN3UvuTUtk2SlEUKbLCLtVALliWAww7rwLEq7MWJLF/FgFlVt+IB 4LabIs05bpIPlI7UimLfpjhArKS5Di/2vTgIpzwsEYxeH2d/tO2iYzenoF5wx2UAkdKDon DBFRUGJZkcW6WJceTEktpwd0YtxGiBqgW03nMgh57EIhK7qF/TTfh0jMV+Qy4P9nW5+Z5N 6XUWxfPY0JTDcvXNIzOcYDTn4inlC20kOihcI3d2fSIj4VzNLVCUKQVb0dI3sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111320; a=rsa-sha256; cv=none; b=hqZ6eVu80gTv+1jRa1py0+7veRSEt6Y8BKpjuJj2oh3OtxE2L8UwYui2kGudyUrQly//df gAw59eti2UJhucS0Y7Cyb0CdfEe9l2wS2ugzCQfuy8s3B3ycpSFhtkNC8Wj6IoakGtXSKY FGChOXLhrGaNonw/n9zD5RJylr41CZscCZHFTb8rZwJ89AVIFuwAzXUwk+54u+OgC+bQ2z Yi3Vd6Qzp35Hv0jjgI4P9NhDMMVy7hYcLEeGaI21+n1U3b8nbcIyhr0ONIsyYyo4VI1b3e fPI1SDF92OuPkxzscA6rDAq+SiW2x+2CEk997DVdI2D6dYzTY1sa5BS2ytM21Q== 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=fb5e4b0e96e4f77f3c6594d1fbc01380facf5902 commit fb5e4b0e96e4f77f3c6594d1fbc01380facf5902 Author: Cy Schubert AuthorDate: 2021-11-28 14:50:10 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:31:37 +0000 lang/mono5.20: Fix build on current with _WITH_CPU_SET_T Fix the same error as lang/mono. (cherry picked from commit 6017a183afd1d58656a75f72277f0cd5111cc0e6) --- lang/mono5.20/files/patch-mono_mini_driver.c | 21 +++++++++++++++++++++ lang/mono5.20/files/patch-mono_utils_mono-proclib.c | 10 ++++++++++ 2 files changed, 31 insertions(+) diff --git a/lang/mono5.20/files/patch-mono_mini_driver.c b/lang/mono5.20/files/patch-mono_mini_driver.c new file mode 100644 index 000000000000..b3601c0d082f --- /dev/null +++ b/lang/mono5.20/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/mono5.20/files/patch-mono_utils_mono-proclib.c b/lang/mono5.20/files/patch-mono_utils_mono-proclib.c new file mode 100644 index 000000000000..94221193c985 --- /dev/null +++ b/lang/mono5.20/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 +