From nobody Fri Dec 10 04:42:00 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 16BBF18DCF5C; Fri, 10 Dec 2021 04:42:02 +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 4J9JCY3SFVz3Nx4; Fri, 10 Dec 2021 04:42:01 +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 C3E651435C; Fri, 10 Dec 2021 04:42:00 +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 1BA4g0KU035788; Fri, 10 Dec 2021 04:42:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4g0pB035787; Fri, 10 Dec 2021 04:42:00 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:42:00 GMT Message-Id: <202112100442.1BA4g0pB035787@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: 11bcbd0ddfba - 2021Q4 - lang/mono6.8: 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: 11bcbd0ddfbaed794522404bfa29cd5c2dc68b7d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111321; 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=bo12dAh7jsG7rfGknvdwBaRUgJR8gCG6z/R5AO8tWmk=; b=tvwwsHR0kOzuD0jlhp2RRvVyxaq/ClEbm86JGp8UcrjIFXIs3tTTcLpK0mbjx/TdnJo/tg 3DOmD1KYaGWYY1zmuJ+IeCPg2K/U+AyfxVDsYLzCNSOITiyEVrFYfhVMMiNmfqJ6CrIDF4 oUfZWsCPc27+EL9HyDlssuThI+J/sIv+KsOe7sDoiY6o0OUCbPIEbhhbTRmJxmNNb5T0I/ JG/Ik/UzgGgYuNBxO/uUqkAJnpD5pd9gCK4SfJKSW+ruZQp9BeG0HbcDPKnh80Ekkr2XRp +M+rEPvC1+tL+MzYj+jDXNtiL385JuZZ6TzW1k5wQf6DasJ61dqyQzbvvvMcGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111321; a=rsa-sha256; cv=none; b=G8Gwu1DYnhwO6KfwAlJnZTPBvRVY+elsCh95i3/YlBsy480eDFbCwxYkoJAe2AkO7yMM5H oy2lRJNBP2SkBSEJ7qdRDNeaH2F3DKpVZZKhxxlDh6buxGdmkjGOxXw7ZirLZ7J2vOsbeq zuHvX/BftyE0w0aFa+ESZBnXIdix3DfxBKntQkBC2wWC5H7oC9+31zytbHp9v/gAgzZWhn xg2NwMsmL3W0DsK5MSj123+oKqlr9hmQ6sqRX29IhxuaKNSYRT5m1ex0/DrPqxdN4dfmLe QgTECh3+hQBHNLlHDW7gKmh1vkrWKxLgX7btaTxOFIvDv7BW18SyYbLtSmxvyg== 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=11bcbd0ddfbaed794522404bfa29cd5c2dc68b7d commit 11bcbd0ddfbaed794522404bfa29cd5c2dc68b7d Author: Cy Schubert AuthorDate: 2021-11-28 20:56:45 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:31:53 +0000 lang/mono6.8: Fix build on current with _WITH_CPU_SET_T Fix the same error as lang/mono. (cherry picked from commit 9e02e52115e43c5c5ec3d971c9100c3cf322b726) --- 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 +