From nobody Thu Dec 9 21:20:18 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 66B7018D01AB; Thu, 9 Dec 2021 21:20:20 +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 4J96Pv2Tb8z3JHG; Thu, 9 Dec 2021 21:20:19 +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 736F25C63; Thu, 9 Dec 2021 21:20:18 +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 1B9LKIKx040861; Thu, 9 Dec 2021 21:20:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9LKI3r040855; Thu, 9 Dec 2021 21:20:18 GMT (envelope-from git) Date: Thu, 9 Dec 2021 21:20:18 GMT Message-Id: <202112092120.1B9LKI3r040855@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: 6e22c3c3fd29 - main - lang/mono5.20: 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: 6e22c3c3fd29ac31c0611e29e6068b62c1e89b43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639084819; 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=c3scfL/NKP9vGi0zEFnvXnE6/Ctztl2FsIUbFPWVkF4=; b=gb3/vK+9GIX3R7ybw+FP/5LZpGD0O0x+MXdvjctekwQtp1hWoAwWO9tLXqFXj3DZC87tlj 18Sav3o5riPr6HNQkGke11765ZVc6IjzHAlXbLuJrCz4iX0nwaxPhNhg79u8ELHTSD2O0C 0egl/bSYOgUalnPkikXE4VP2yNeQh1TxaMcqZcEpntA0Wjw+kA1XtMPhLQ6vULFXmcRUwf txKb8xgykRUUbSBvuO2Vb+9JMrPzbCOGEsJU80Y4bNB2pdfbyTLm58S2nkCUkokZp/HWcC DmMOVGvBl8R/WtQSorQFwriU111VotOp/+ml7dSNMvgniDIInXlM/JO+WQTIGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639084819; a=rsa-sha256; cv=none; b=BObAKlgKuEWZu2PFjzRny2rF0VRHkpCHtXP7brcnRahuIfmmbDBW3wuQFwJn8xUvOmNWCh 1kYz0oNv15cvecmj1ULJN8AAAvRQLtNTqbdzcFRz/08RhyrvkGexbFlJGR0y29fHJHPT+n FJntr9Com6Q3+o6vehAdF0090eP1yUi+KD3Q2bRrNtb1E3EFcxmthc6lsE3z+0y2QvcpRU 9xjAKxf6DJE3SvNzN9LgcP7gqQ/PsaFnrDW0wSZJx1mqw0IyFyW1gEjStug58GEdq+WBbh IHPxEE2UIjuSV8cX3PbWqBr3f7IhnyZEfqb3p8S22l6Vm2WOP1p/jBm816oc/w== 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=6e22c3c3fd29ac31c0611e29e6068b62c1e89b43 commit 6e22c3c3fd29ac31c0611e29e6068b62c1e89b43 Author: Cy Schubert AuthorDate: 2021-12-09 19:19:26 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 20:37:13 +0000 lang/mono5.20: Invoke CPU_COUNT properly 6017a183afd1d58656a75f72277f0cd5111cc0e6 did not include a patch to configure.ac that allowed it to properly detect CPU_COUNT. Fixes: 6017a183afd1d58656a75f72277f0cd5111cc0e6 MFH: 2021Q4 --- lang/mono5.20/files/patch-configure.ac | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/lang/mono5.20/files/patch-configure.ac b/lang/mono5.20/files/patch-configure.ac index b03bd39eca31..d798710c3e41 100644 --- a/lang/mono5.20/files/patch-configure.ac +++ b/lang/mono5.20/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2021-01-07 15:31:48 UTC -+++ configure.ac +--- configure.ac.orig 2019-07-16 11:21:42.000000000 -0700 ++++ configure.ac 2021-12-09 10:42:53.117495000 -0800 @@ -203,6 +203,12 @@ libdl= libgc_threads=pthreads @@ -13,7 +13,29 @@ has_dtrace=yes with_sgen_default_concurrent=yes ;; -@@ -4001,13 +4007,10 @@ +@@ -1947,7 +1953,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); + ], [ +@@ -1958,8 +1965,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]) +@@ -4001,13 +4009,10 @@ ;; macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | \ @@ -28,7 +50,7 @@ else TARGET=POWERPC; CPPFLAGS="$CPPFLAGS -D__mono_ppc__" -@@ -4022,6 +4025,10 @@ +@@ -4022,6 +4027,10 @@ dnl we may hardcode 64-bit names at times, but we don't do 32-bit AIX, so LIBC="libc.a(shr_64.o)" INTL="libintl.a(libintl.so.8)"