Attachment 253040 Details for Bug 280165 – v0

[patch] v0

mysql.patch (text/plain), 4.32 KB, created by Mikael Urankar on 2024-08-23 17:22:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2024-08-23 17:22:42 UTC

Size: 4.32 KB

patch

obsolete

>From 8238798a91277e23611892db9d2e4b5afd201535 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Fri, 23 Aug 2024 19:19:58 +0200
>Subject: [PATCH 1/3] databases/mysql84-server: Fix SIGILL on aarch64
>
>We want to check HWCAP_PMULL not HWCAP_CRC32.
>
>PR:		280165
>---
> databases/mysql84-server/Makefile                               | 2 +-
> .../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; }
>-- 
>2.46.0
>
>
>From 9499ba6fdcb556d86cb8347d4db175f60c125673 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Fri, 23 Aug 2024 19:21:45 +0200
>Subject: [PATCH 2/3] databases/mysql80-server: Fix SIGILL on aarch64
>
>We want to check HWCAP_PMULL not HWCAP_CRC32.
>
>PR:		280165
>---
> databases/mysql80-server/Makefile                               | 2 +-
> .../mysql80-server/files/patch-storage_innobase_ut_crc32.cc     | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
>index a2f1c5073108..a70463c7dcc8 100644
>--- a/databases/mysql80-server/Makefile
>+++ b/databases/mysql80-server/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME?=		mysql
> PORTVERSION=		8.0.39
>-PORTREVISION?=		0
>+PORTREVISION?=		1
> CATEGORIES=		databases
> MASTER_SITES=		MYSQL/MySQL-8.0
> PKGNAMESUFFIX?=		80-server
>diff --git a/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
>index 1a033524dbce..19a2bb2cc1ad 100644
>--- a/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
>+++ b/databases/mysql80-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; }
>-- 
>2.46.0
>
>
>From 01f6fdafe358b5d1bc8aab097b435e1e2952d3b0 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Fri, 23 Aug 2024 19:22:00 +0200
>Subject: [PATCH 3/3] databases/mysql81-server: Fix SIGILL on aarch64
>
>We want to check HWCAP_PMULL not HWCAP_CRC32.
>
>PR:		280165
>---
> databases/mysql81-server/Makefile                               | 2 +-
> .../mysql81-server/files/patch-storage_innobase_ut_crc32.cc     | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/databases/mysql81-server/Makefile b/databases/mysql81-server/Makefile
>index b65cc8a957ae..eecad7e5103e 100644
>--- a/databases/mysql81-server/Makefile
>+++ b/databases/mysql81-server/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME?=		mysql
> PORTVERSION=		8.1.0
>-PORTREVISION?=		0
>+PORTREVISION?=		1
> CATEGORIES=		databases
> MASTER_SITES=		MYSQL/MySQL-8.1
> PKGNAMESUFFIX?=		81-server
>diff --git a/databases/mysql81-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql81-server/files/patch-storage_innobase_ut_crc32.cc
>index d8662b03ba53..6b9ab88ef7d5 100644
>--- a/databases/mysql81-server/files/patch-storage_innobase_ut_crc32.cc
>+++ b/databases/mysql81-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; }
>-- 
>2.46.0
>

Actions: View | Diff

Attachments on bug 280165: 253040