From nobody Fri Dec 10 04:42:13 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 693C218DD697; Fri, 10 Dec 2021 04:42: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 4J9JCp5240z3P83; Fri, 10 Dec 2021 04:42:13 +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 5BDEA144BF; Fri, 10 Dec 2021 04:42:13 +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 1BA4gDq8036064; Fri, 10 Dec 2021 04:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4gDpp036063; Fri, 10 Dec 2021 04:42:13 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:42:13 GMT Message-Id: <202112100442.1BA4gDpp036063@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: a67d313aca6c - 2021Q4 - lang/mono5.10: 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: a67d313aca6cb2af1eb90945557c8a7ea3facdcf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111334; 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=l9mSKjpxeoWglYccYTDp2afgSIa6k2eaVWl/ocaWZ+4=; b=oXq66oVoysu4TuTCV59I3HEcySdt/LALuU1eGA/GOGmpc7mIVBMTyf3VAbqgF5LxhS2vTo ToT6BuXuZ6FsGrH1hWujECIPVev1FnwT6BfHwjE1EOnZxDgTZLHOHd+t7dgRHop5q6WTfy S7VClZnS37oODO06FuSF1n8qU16aEGxuhyn2U/+JQ7udWKJowcSiQWQFIemfbytVAsUrlT CvAcHtCbcHQk+OvjBQV1gtCO0hVHTYKx/+B/XMxJeXsaBTethqeNly3UcncLduwQEqbXec f6b18di0W9GcN8nkD+Pa42ZXdbtAY5MfKO/7soHe5kpELGlQC2mEmUoHQUzciA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111334; a=rsa-sha256; cv=none; b=Xwftvooj5BaBJibsbV1444fzKoPjb+i2xYzSfYkGAPD1MrM2tJ02p3JidHB5cHP08svb65 F88IaBE2P45uw7Mv6AweAFeycObvyUUGQge8okXcjQSrG3/AJusybRogwGZ6I02fCqAyLP u2EfSs1Ct06L+//0CyQ4jtL29sNIBITYj58LsTU1LAZ2gr85IEEEirUXlchaZli5+ko5fE usegfENbUXuXFdchlMDH8K2FCbn611gYgPvqtjhIiza9IYKpxt//z3/97lwv3wqqjc159U JX49cyYJ2nyWOxqQYan27rGgSo41cQ+a9fbIJx1y1QxsylOtSelvJwKe8nfWOA== 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=a67d313aca6cb2af1eb90945557c8a7ea3facdcf commit a67d313aca6cb2af1eb90945557c8a7ea3facdcf Author: Cy Schubert AuthorDate: 2021-12-09 18:40:20 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:40:04 +0000 lang/mono5.10: Invoke CPU_COUNT properly 3a278c7add6265e6d545f3014d7f6a6e9c222fa7 did not include a patch to configure.ac that allowed it to properly detect CPU_COUNT. Fixes: 3a278c7add6265e6d545f3014d7f6a6e9c222fa7 (cherry picked from commit 0435eab9f0396fceaa33339240604e740b00a858) --- lang/mono5.10/files/patch-configure.ac | 64 +++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/lang/mono5.10/files/patch-configure.ac b/lang/mono5.10/files/patch-configure.ac index 280b4da2ddb1..6c0365d0e3a5 100644 --- a/lang/mono5.10/files/patch-configure.ac +++ b/lang/mono5.10/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 10:35:50.670421000 -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"