git: 90179a1242bc - main - databases/mysql84-server: Fix SIGILL on aarch64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Aug 2024 08:13:48 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=90179a1242bc8aec6bd15491841049ee823ed320
commit 90179a1242bc8aec6bd15491841049ee823ed320
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-08-23 17:19:58 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-08-26 08:13:37 +0000
databases/mysql84-server: Fix SIGILL on aarch64
We want to check HWCAP_PMULL not HWCAP_CRC32.
Approved by: portmgr (trivial runtime fix)
PR: 280165
---
databases/mysql84-server/Makefile | 2 +-
databases/mysql84-server/files/patch-storage_innobase_ut_crc32.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile
index aa16428a1ce3..684cd4306543 100644
--- a/databases/mysql84-server/Makefile
+++ b/databases/mysql84-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= mysql
PORTVERSION= 8.4.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.4
PKGNAMESUFFIX?= 84-server
diff --git a/databases/mysql84-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql84-server/files/patch-storage_innobase_ut_crc32.cc
index af15dd2ee114..4a2609cc1491 100644
--- a/databases/mysql84-server/files/patch-storage_innobase_ut_crc32.cc
+++ b/databases/mysql84-server/files/patch-storage_innobase_ut_crc32.cc
@@ -17,7 +17,7 @@
+
+ if (elf_aux_info(AT_HWCAP, &capabilities, sizeof(unsigned long)))
+ return false;
-+ return capabilities & HWCAP_CRC32;
++ return capabilities & HWCAP_PMULL;
+}
+#else
bool can_use_crc32() { return getauxval(AT_HWCAP) & HWCAP_CRC32; }