From nobody Thu Dec 9 21:20:16 2021 X-Original-To: dev-commits-ports-all@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 AC09318CFE7D; Thu, 9 Dec 2021 21:20:16 +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 4J96Pr2zhkz3J5t; Thu, 9 Dec 2021 21:20:16 +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 47ED56034; Thu, 9 Dec 2021 21:20:16 +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 1B9LKGjx039809; Thu, 9 Dec 2021 21:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9LKG6P039803; Thu, 9 Dec 2021 21:20:16 GMT (envelope-from git) Date: Thu, 9 Dec 2021 21:20:16 GMT Message-Id: <202112092120.1B9LKG6P039803@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: a8176108d5dd - main - lang/mono: Invoke CPU_COUNT properly List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: a8176108d5dd60dd740cf34a514989da21c86f99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639084816; 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=HPZkR++kG/8p/bUWcYC3GSCotuQDx5tnrS0RxL5FCqY=; b=sI3Sg3HiOQ6vCuq0sCJ3WxaInzGcxKacj1Leyai6xzMSaKZNN9dZD/IiF3dRrm8TA2Tq05 XxF3iYzSn0V4Gr9cmC6tyMjJOMiQs7Sr/KKi6JwmlkVIv6wuPSNSju/DDNGtA+TlSjnOtF 4VeMlKMWCRVuXziOB9Xi1vjvxFjl6urYv8ChVP4vdaBI+pg7C13aKJraWJvi/E/g1h+wEp La2MTMpWc8oVrdEiBrDdN4IBShK40Z9LSuWjzf5d+r/Epub3DrzqvFfcSHUcpPqDgrby83 WY6tZSSdMfpWchSiZS5fHgiM8a58pfaC6CrPJx4DclWyodJVbX68HWIY7IXTJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639084816; a=rsa-sha256; cv=none; b=ET+OSYw14aFbJ9W7mZsqj+mgo6if1QFHrINX7sE3/gpFs05ZdMKiVzZ01aqQUHeCWU/cnD ZvUD3ZMxKPDV5iaEOylxgkZd/OrpQ2PS3F7uUsXOqa+0JdvsnythejRPg0p0lsFoVc6JaM 9syHfLIYhf0zT9DCmthW38Y8eQO9tFxfsdZ79cy0hdNO+S8S6+ifGXh/3Su6iE5r0d06+f dVF4T1A3eKWNfj4o+fIxu24XLP+GSze1XlNEjXR1giHCJcqxrhIvWLwL4MMvPxO42XAH0g W5d+JU/YB3brt4pNHh+6DQ7/e57A9jRw93I9DNAZP8yI3luaAph/qiknBzGpJg== 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=a8176108d5dd60dd740cf34a514989da21c86f99 commit a8176108d5dd60dd740cf34a514989da21c86f99 Author: Cy Schubert AuthorDate: 2021-12-09 16:24:56 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 20:37:12 +0000 lang/mono: Invoke CPU_COUNT properly 83c19a7238e9f5f46a9186e3ce58d03585691e5d did not include a patch to configure.ac that allowed it to properly detect CPU_COUNT. Fixes: 83c19a7238e9f5f46a9186e3ce58d03585691e5d MFH: 2021Q4 --- lang/mono/files/patch-configure.ac | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/lang/mono/files/patch-configure.ac b/lang/mono/files/patch-configure.ac index 4f52bab098b9..fb9bcde50fa8 100644 --- a/lang/mono/files/patch-configure.ac +++ b/lang/mono/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2018-08-24 17:19:14.000000000 +0200 -+++ configure.ac 2021-10-17 17:15:00.295997000 +0200 -@@ -201,6 +201,12 @@ case "$host" in +--- configure.ac.orig 2018-08-24 08:19:14.000000000 -0700 ++++ configure.ac 2021-12-09 07:38:57.727183000 -0800 +@@ -201,6 +201,12 @@ libdl= libgc_threads=pthreads use_sigposix=yes @@ -13,7 +13,29 @@ has_dtrace=yes with_sgen_default_concurrent=yes ;; -@@ -3298,6 +3304,8 @@ case "$host" in +@@ -1668,7 +1674,8 @@ + dnl *** won't always indicate the interface sched_affinity has. *** + dnl **************************************************************** + AC_MSG_CHECKING(for sched_setaffinity from glibc < 2.3.4) +- AC_TRY_COMPILE([#include ], [ ++ AC_TRY_COMPILE([#define _WITH_CPU_SET_T ++#include ], [ + int mask = 1; + sched_setaffinity(0, &mask); + return 0; +@@ -1680,8 +1687,9 @@ + # We have the new, three-parameter version + AC_MSG_RESULT(no) + ]) +- AC_TRY_COMPILE([#include ], [ +- CPU_COUNT((void *) 0); ++ AC_TRY_COMPILE([#define _WITH_CPU_SET_T ++#include ], [ ++ CPU_COUNT((cpuset_t *) 0); + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(GLIBC_HAS_CPU_COUNT, 1, [GLIBC has CPU_COUNT macro in sched.h]) +@@ -3298,6 +3306,8 @@ BTLS_PLATFORM=i386 ;; openbsd*|freebsd*|kfreebsd-gnu*) @@ -22,7 +44,7 @@ ;; esac ;; -@@ -3322,6 +3330,8 @@ case "$host" in +@@ -3322,6 +3332,8 @@ boehm_supported=false ;; openbsd*|freebsd*|kfreebsd-gnu*) @@ -31,7 +53,7 @@ ;; mingw*) ;; -@@ -3355,11 +3365,10 @@ case "$host" in +@@ -3355,11 +3367,10 @@ INTL="intl" ;; macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ @@ -44,7 +66,7 @@ else TARGET=POWERPC; CPPFLAGS="$CPPFLAGS -D__mono_ppc__" -@@ -4425,6 +4434,7 @@ if test "x$enable_btls" = "xyes"; then +@@ -4425,6 +4436,7 @@ ;; aarch64) btls_arch=aarch64