Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_166400568732260"
MIME-Version: 1.0
Date: Sat, 24 Sep 2022 07:48:07 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/lang/mono
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20220924074807.110FDFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_166400568732260
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sat Sep 24 07:48:07 UTC 2022

Modified Files:
	pkgsrc/lang/mono: distinfo
Added Files:
	pkgsrc/lang/mono/patches:
	    patch-external_boringssl_crypto_cpu-aarch64-linux.c

Log Message:
mono: Don't assume <sys/auxv.h> is available on NetBSD/aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/lang/mono/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mono/patches/patch-external_boringssl_crypto_cpu-aarch64-linux.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_166400568732260
Content-Disposition: inline
Content-Length: 2641
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/mono/distinfo
diff -u pkgsrc/lang/mono/distinfo:1.117 pkgsrc/lang/mono/distinfo:1.118
--- pkgsrc/lang/mono/distinfo:1.117	Tue Sep 20 15:59:33 2022
+++ pkgsrc/lang/mono/distinfo	Sat Sep 24 07:48:06 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2022/09/20 15:59:33 he Exp $
+$NetBSD: distinfo,v 1.118 2022/09/24 07:48:06 nia Exp $
 
 BLAKE2s (mono-6.12.0.122.tar.xz) = 0f4ef4106e8974fea9ddc2b61ab1b0ebd2a8182fb9f098ec9c46655b4ac1b867
 SHA512 (mono-6.12.0.122.tar.xz) = 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
@@ -13,6 +13,7 @@ SHA1 (patch-data_net__4__0_Browsers_Make
 SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606
 SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
 SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
+SHA1 (patch-external_boringssl_crypto_cpu-aarch64-linux.c) = 7c876a1e937e21758199a1842bfc15c205069922
 SHA1 (patch-external_boringssl_include_openssl_thread.h) = a0855fa36e98111961e58338e7c810c5e0568bfb
 SHA1 (patch-external_corert_src_Native_gc_env_gcenv.structs.h) = 91b37d93c1c3aadcdb383c443142fe28f50ad8e6
 SHA1 (patch-mcs_class_System_System.Net.NetworkInformation_UnixNetworkInterfaceFactory.cs) = 90cb31154f325c19ae82a9e7dd52b4de0ee7b2d2

Added files:

Index: pkgsrc/lang/mono/patches/patch-external_boringssl_crypto_cpu-aarch64-linux.c
diff -u /dev/null pkgsrc/lang/mono/patches/patch-external_boringssl_crypto_cpu-aarch64-linux.c:1.1
--- /dev/null	Sat Sep 24 07:48:07 2022
+++ pkgsrc/lang/mono/patches/patch-external_boringssl_crypto_cpu-aarch64-linux.c	Sat Sep 24 07:48:06 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-external_boringssl_crypto_cpu-aarch64-linux.c,v 1.1 2022/09/24 07:48:06 nia Exp $
+
+NetBSD does not have sys/auxv.h.
+
+XXX: This needs to be fixed to actually check for AES instructions, etc.
+Perhaps there's a machdep sysctl variable?
+
+--- external/boringssl/crypto/cpu-aarch64-linux.c.orig	2021-02-22 15:51:09.000000000 +0000
++++ external/boringssl/crypto/cpu-aarch64-linux.c
+@@ -16,8 +16,6 @@
+ 
+ #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
+ 
+-#include <sys/auxv.h>
+-
+ #include <openssl/arm_arch.h>
+ 
+ #include "internal.h"
+@@ -65,8 +63,15 @@ void OPENSSL_cpuid_setup(void) {
+   }
+ }
+ 
++#elif defined(__NetBSD__)
++
++void OPENSSL_cpuid_setup(void) {
++  OPENSSL_armcap_P |= ARMV7_NEON;
++}
+ #else // linux
+ 
++#include <sys/auxv.h>
++
+ void OPENSSL_cpuid_setup(void) {
+   unsigned long hwcap = getauxval(AT_HWCAP);
+ 


--_----------=_166400568732260--