diff options
| -rw-r--r-- | databases/mariadb105-server/Makefile | 7 | ||||
| -rw-r--r-- | databases/mariadb105-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb105-server/files/patch-include_my__cpu.h | 48 | ||||
| -rw-r--r-- | databases/mariadb105-server/files/patch-sql_mysqld.cc | 20 |
4 files changed, 7 insertions, 74 deletions
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index f53510db050b..51379d845f13 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.5.26 +PORTVERSION= 10.5.27 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= \ @@ -30,7 +30,7 @@ LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection LDFLAGS+= -L${LOCALBASE}/lib -USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl +USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses pkgconfig shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -125,7 +125,8 @@ CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysqlwsrep*-server \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ + mytop FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index 313dd9b0868c..af6ba25d52cb 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723535792 -SHA256 (mariadb-10.5.26.tar.gz) = dd5f99a1d30ae47365fc18b1deeff6dc0ab38ac84e7d9fd9c8c04ff6b01961f1 -SIZE (mariadb-10.5.26.tar.gz) = 116566259 +TIMESTAMP = 1731238427 +SHA256 (mariadb-10.5.27.tar.gz) = efa64fa5f733b822ab1a6795e1ebc179c160c08690ecd71dba1eb0f61aeedd14 +SIZE (mariadb-10.5.27.tar.gz) = 116496630 diff --git a/databases/mariadb105-server/files/patch-include_my__cpu.h b/databases/mariadb105-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb105-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/mariadb105-server/files/patch-sql_mysqld.cc b/databases/mariadb105-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e433bfc7d450..000000000000 --- a/databases/mariadb105-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); |