CVS commit: pkgsrc/databases/mariadb105-client

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul  3 09:23:45 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb105-client: distinfo
Added Files:
        pkgsrc/databases/mariadb105-client/patches:
            patch-mysys_crc32_crc32__arm64.c

Log Message:
mariadb105-client: Fix building on NetBSD/aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb105-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c

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

Modified files:

Index: pkgsrc/databases/mariadb105-client/distinfo
diff -u pkgsrc/databases/mariadb105-client/distinfo:1.1 pkgsrc/databases/mariadb105-client/distinfo:1.2
--- pkgsrc/databases/mariadb105-client/distinfo:1.1     Sun May 23 15:32:47 2021
+++ pkgsrc/databases/mariadb105-client/distinfo Sat Jul  3 09:23:45 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2021/05/23 15:32:47 nia Exp $
+$NetBSD: distinfo,v 1.2 2021/07/03 09:23:45 nia Exp $
 
 SHA1 (mariadb-10.5.10.tar.gz) = 7381ea990812be76b39688115f2cae40aa68b1d4
 RMD160 (mariadb-10.5.10.tar.gz) = 243fa6266f93d4a01c377b95704a3923b62eadce
@@ -9,6 +9,7 @@ SHA1 (patch-CMakeLists.txt) = 893f329ed0
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
+SHA1 (patch-mysys_crc32_crc32__arm64.c) = 0a479d4e9c6a186c631f3c0f99d15f633c8a484a
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-mysys_my__largepage.c) = d04a7a60f9cc6d70f30e454130ea0b76d7d98b3e
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317

Added files:

Index: pkgsrc/databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c
diff -u /dev/null pkgsrc/databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c:1.1
--- /dev/null   Sat Jul  3 09:23:45 2021
+++ pkgsrc/databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c Sat Jul  3 09:23:45 2021
@@ -0,0 +1,31 @@
+$NetBSD: patch-mysys_crc32_crc32__arm64.c,v 1.1 2021/07/03 09:23:45 nia Exp $
+
+Fix building on NetBSD/aarch64.
+
+--- mysys/crc32/crc32_arm64.c.orig     2021-05-05 21:00:19.000000000 +0000
++++ mysys/crc32/crc32_arm64.c
+@@ -2,13 +2,13 @@
+ #include <string.h>
+ #include <stdint.h>
+ 
++static int pmull_supported;
++
+ #if defined(HAVE_ARMV8_CRC)
+ 
+ #if defined(__APPLE__)
+ #include <sys/sysctl.h>
+ 
+-static int pmull_supported;
+-
+ int crc32_aarch64_available(void)
+ {
+   int ret;
+@@ -48,8 +48,6 @@ static unsigned long getauxval(unsigned 
+ # define HWCAP_PMULL (1 << 4)
+ #endif
+ 
+-static int pmull_supported;
+-
+ /* ARM made crc32 default from ARMv8.1 but optional in ARMv8A
+  * Runtime check API.
+  */