Date: Sun, 10 Nov 2024 11:53:39 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 16c2d87220da - main - databases/mariadb1011-server: Update to 10.11.10 Message-ID: <202411101153.4AABrdq0074322@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=16c2d87220dacc472587fbbc1c344a5b5eaeb273 commit 16c2d87220dacc472587fbbc1c344a5b5eaeb273 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2024-11-10 11:53:36 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2024-11-10 11:53:36 +0000 databases/mariadb1011-server: Update to 10.11.10 --- databases/mariadb1011-server/Makefile | 3 +- databases/mariadb1011-server/distinfo | 6 +-- .../files/patch-include_my__cpu.h | 48 ---------------------- .../files/patch-mysys_crc32_crc32c.cc | 11 ----- .../mariadb1011-server/files/patch-sql_mysqld.cc | 20 --------- 5 files changed, 5 insertions(+), 83 deletions(-) diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile index e123af229447..ea21c4fe3c0a 100644 --- a/databases/mariadb1011-server/Makefile +++ b/databases/mariadb1011-server/Makefile @@ -1,5 +1,6 @@ PORTNAME?= mariadb -PORTVERSION= 10.11.9 +PORTVERSION= 10.11.10 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo index fdbd697c9482..e9508dda35f6 100644 --- a/databases/mariadb1011-server/distinfo +++ b/databases/mariadb1011-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723391398 -SHA256 (mariadb-10.11.9.tar.gz) = 0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20 -SIZE (mariadb-10.11.9.tar.gz) = 101611566 +TIMESTAMP = 1731237806 +SHA256 (mariadb-10.11.10.tar.gz) = b06a74650b83a16aa9ab098984482b028e75b000674b11ff288772c619a6f022 +SIZE (mariadb-10.11.10.tar.gz) = 104463642 diff --git a/databases/mariadb1011-server/files/patch-include_my__cpu.h b/databases/mariadb1011-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb1011-server/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC -+++ include/my_cpu.h -@@ -23,7 +23,8 @@ - The defines are the same ones used by the linux kernel - */ - --#ifdef _ARCH_PWR8 -+#if defined(_ARCH_PWR8) -+#if defined(linux) - #include <sys/platform/ppc.h> - /* Very low priority */ - #define HMT_very_low() __ppc_set_ppr_very_low() -@@ -37,6 +38,22 @@ - #define HMT_medium_high() __ppc_set_ppr_med_high() - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/sysctl.h> -+/* Very low priority */ -+#define HMT_very_low() __asm__ volatile ("or 31,31,31") -+/* Low priority */ -+#define HMT_low() __asm__ volatile ("or 1,1,1") -+/* Medium low priority */ -+#define HMT_medium_low() __asm__ volatile ("or 6,6,6") -+/* Medium priority */ -+#define HMT_medium() __asm__ volatile ("or 2,2,2") -+/* Medium high priority */ -+#define HMT_medium_high() __asm__ volatile ("or 5,5,5") -+/* High priority */ -+#define HMT_high() asm volatile("or 3,3,3") -+#endif - #else - #define HMT_very_low() - #define HMT_low() -@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -+#if defined(linux) - __ppc_get_timebase(); -+#elif defined(__FreeBSD__) -+ uint64_t __tb; -+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -+#endif - #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) - /* Mainly, prevent the compiler from optimizing away delay loops */ - #ifdef _aarch64_ diff --git a/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc deleted file mode 100644 index 86261dbdc160..000000000000 --- a/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- mysys/crc32/crc32c.cc.orig 2024-06-14 12:14:03 UTC -+++ mysys/crc32/crc32c.cc -@@ -455,7 +455,7 @@ static int arch_ppc_probe(void) { - - return arch_ppc_crc32; - } --# elif defined __FreeBSD_version && __FreeBSD_version >= 1200000 -+# elif defined __FreeBSD__ - # include <machine/cpu.h> - # include <sys/auxv.h> - # include <sys/elf_common.h> diff --git a/databases/mariadb1011-server/files/patch-sql_mysqld.cc b/databases/mariadb1011-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e433bfc7d450..000000000000 --- a/databases/mariadb1011-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC -+++ sql/mysqld.cc -@@ -205,7 +205,7 @@ typedef fp_except fp_except_t; - - inline void setup_fpu() - { --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) - /* We can't handle floating point exceptions with threads, so disable - this on freebsd - Don't fall for overflow, underflow,divide-by-zero or loss of precision. -@@ -218,7 +218,7 @@ inline void setup_fpu() - fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | - FP_X_IMP)); - #endif /* FP_X_DNML */ --#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ -+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */ - - #ifdef HAVE_FEDISABLEEXCEPT - fedisableexcept(FE_ALL_EXCEPT);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411101153.4AABrdq0074322>