From nobody Fri Dec 10 04:42:14 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 3601F18DD37D; Fri, 10 Dec 2021 04:42:18 +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 4J9JCr3vqCz3PHB; Fri, 10 Dec 2021 04:42: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 8CC5D140E8; Fri, 10 Dec 2021 04:42:14 +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 1BA4gEju036088; Fri, 10 Dec 2021 04:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4gE4h036087; Fri, 10 Dec 2021 04:42:14 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:42:14 GMT Message-Id: <202112100442.1BA4gE4h036087@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: 34d37f18628a - 2021Q4 - lang/mono5.20: Invoke CPU_COUNT properly 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: 34d37f18628a1dbdfe15bc7e0f31c60ce8cbcd01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111336; 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=/BioLhghe1Yx3+x8b8Q/zwpJ4wZTTjNf3qd2QztVgJk=; b=xgVZsLX9RYb2LODfRCSySOJiNB6WCO4NGBSh1CIYRrOgPjrDTZqcMx85WXM3qne/nGmwqT iH5hFbWNrnNFB++VM/CzCHWkjfoEz1DwS0z99ovBhwWjoDREb+s9Xrjtq7vmlLd6NSlS3n nLOtBXmz5yRRyMKRQq+NJ0GvL7blVONUh1x5NPjhi5oM2771mqKsELbhYCLwMr0QJdj+it Hq3W6UeicqUo0DpQ75qMAJBxu4XtzD8u6R9WC0C8+K0AzUnlKWtmmM1EFY6fAOOPFWEq2k mjyokpGkfW8qxS2/AbspiIrQLd7YLKMOMwKbfHYopSMBBsqrCcaPd5rs59xxAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111336; a=rsa-sha256; cv=none; b=tSjnTqEDytlu1eK7gykZVwORTTO4HGRGzChrjEAzCl5Z/Y7QmHEus0e67oNawQdgtCFYXu QRLsETS/le6IQak4pSTBVlCLZhPOy0WAf2xTaj7rYFC2k1V2olfiXMKvRkxtXpuG0Zc+f/ 6nSNJUGEp/WH3TS9VROTH7RGBOieXEFrShJlA1T4m/PvfL766YyL6fNjOY67yRF03mWj4C ECcsK2ezLzhebqRPvVgN5B7b/XDQe5hm6nZXef+4YVrSE1n2LXwMHYwDpLH9Bwrgdc89pw yXtU7oes/p3XyU29dmwQLKcY3Nkeoe0jKR0IThROWjrHzbhpEuGMMUbM1TrdOw== 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=34d37f18628a1dbdfe15bc7e0f31c60ce8cbcd01 commit 34d37f18628a1dbdfe15bc7e0f31c60ce8cbcd01 Author: Cy Schubert AuthorDate: 2021-12-09 19:19:26 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:40:46 +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 (cherry picked from commit 6e22c3c3fd29ac31c0611e29e6068b62c1e89b43) --- lang/mono5.20/files/patch-configure.ac | 54 ++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/lang/mono5.20/files/patch-configure.ac b/lang/mono5.20/files/patch-configure.ac index 6e81b846c43a..d798710c3e41 100644 --- a/lang/mono5.20/files/patch-configure.ac +++ b/lang/mono5.20/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2021-01-07 15:31:48 UTC -+++ configure.ac -@@ -203,6 +203,12 @@ case "$host" in +--- 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 use_sigposix=yes @@ -13,3 +13,51 @@ has_dtrace=yes with_sgen_default_concurrent=yes ;; +@@ -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* | \ +- powerpc-*-freebsd* | powerpc*-*-aix* | powerpc*-*-os400* ) ++ powerpc*-*-freebsd* | powerpc*-*-aix* | powerpc*-*-os400* ) + if test "x$ac_cv_sizeof_void_p" = "x8"; then + TARGET=POWERPC64; + CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__" +- if ! (echo $CC | grep -q -- 'clang'); then +- CFLAGS="$CFLAGS -mminimal-toc" +- fi + else + TARGET=POWERPC; + CPPFLAGS="$CPPFLAGS -D__mono_ppc__" +@@ -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)" ++ ;; ++ freebsd*) ++ BTLS_SUPPORTED=yes ++ BTLS_PLATFORM=powerpc + ;; + linux*) + BTLS_SUPPORTED=yes