From nobody Fri Dec 10 04:42:12 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 901CD18DD46A; Fri, 10 Dec 2021 04:42:15 +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 4J9JCm3sbLz3P9d; Fri, 10 Dec 2021 04:42:12 +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 3668614065; Fri, 10 Dec 2021 04:42:12 +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 1BA4gCwb036040; Fri, 10 Dec 2021 04:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4gCW2036039; Fri, 10 Dec 2021 04:42:12 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:42:12 GMT Message-Id: <202112100442.1BA4gCW2036039@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: ffa043014eed - 2021Q4 - lang/mono: 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: ffa043014eed80b9930c0ca8e4a78383dd7a56ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111333; 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=luAhaO2PZ6xg8wAFzC4GI++l0Txmpm4eTx1vNJLE6qg=; b=KpD6DAotIVWzdR20oazVvTOa+DEUZnk7hSrvO3tOA8PEPAdQb6v2X5bn8NuvMqOJMKpEmb CoHBGTLYjUNusQUlOHDzyI+odIBiCdhQNfwb7/fyMqtkVE+Sk3AG1j5BxgyX820UcxDVNo bMfhw1Az0qY7qtPLcGgt5ku9Kf9+EsfCkmpGubwazYZy5/9SYQ3/ftnno9yaeBqWHUJlvx U6irNNWal12VLpbEA4pxYD1qmxRMraL/80kmce65ETDx0Ge9xdqHjf9adpeASYlwfImV2/ lnqT9CafnrQQNoAiHKWj/q4hr03k69sLVYuDkw95YOX3hKsadqBbdtNgcoOOBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111333; a=rsa-sha256; cv=none; b=cqMpkOMXYGQ4gqj+86elV9B2nJyGjRM5eYKDw+yiSK7j0Z8tbYanlVB/zJ/rVdgHKCxeJB 48WXp6SZPTnnLRuPhYLaApxSsq0X2F5bckUIpKjeHK4DACMIaUQDJGLVy/6KNMaL9jJYCc E7k5Tg8mfQiuLUFsfAoEcBRdnqBm59/hOakE++Slk0WKHb9gnLZaQy+CAm9Znv8Lj+8iNj AUZ5heiYGR1WX5Vsbs31dikcZAM0AhprP0MdYZtc7yg+dNgX6w5ciF6wsd/wyv5Nx2ORHJ 3PuzuAH0oeKUEaLNEnB0xFra5Pdj7qaApsotvsJJ81b5TA2SA35mF4SM9BxK1A== 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=ffa043014eed80b9930c0ca8e4a78383dd7a56ce commit ffa043014eed80b9930c0ca8e4a78383dd7a56ce Author: Cy Schubert AuthorDate: 2021-12-09 16:24:56 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:38:53 +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 (cherry picked from commit a8176108d5dd60dd740cf34a514989da21c86f99) --- lang/mono/files/patch-configure.ac | 64 +++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/lang/mono/files/patch-configure.ac b/lang/mono/files/patch-configure.ac index 280b4da2ddb1..fb9bcde50fa8 100644 --- a/lang/mono/files/patch-configure.ac +++ b/lang/mono/files/patch-configure.ac @@ -1,6 +1,41 @@ ---- configure.ac.orig 2018-04-18 10:51:42.000000000 +0300 -+++ configure.ac 2018-06-24 02:38:19.860780000 +0300 -@@ -3271,6 +3271,8 @@ +--- 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 ++ case "$host" in ++ aarch64-*) ++ support_boehm=no ++ with_gc=sgen ++ ;; ++ esac + has_dtrace=yes + with_sgen_default_concurrent=yes + ;; +@@ -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*) @@ -9,7 +44,7 @@ ;; esac ;; -@@ -3295,6 +3297,8 @@ +@@ -3322,6 +3332,8 @@ boehm_supported=false ;; openbsd*|freebsd*|kfreebsd-gnu*) @@ -18,3 +53,24 @@ ;; mingw*) ;; +@@ -3355,11 +3367,10 @@ + INTL="intl" + ;; + macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ +- powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* ) ++ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc*-*-freebsd* ) + if test "x$ac_cv_sizeof_void_p" = "x8"; then + TARGET=POWERPC64; + CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__" +- CFLAGS="$CFLAGS -mminimal-toc" + else + TARGET=POWERPC; + CPPFLAGS="$CPPFLAGS -D__mono_ppc__" +@@ -4425,6 +4436,7 @@ + ;; + aarch64) + btls_arch=aarch64 ++ btls_cflags="-march=armv8-a+crypto" + ;; + android-armv5) + BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"