* [PR PATCH] mariadb: update to 10.6.0.
@ 2021-05-11 5:56 Veganizer
2021-05-11 14:49 ` [PR PATCH] [Updated] " Veganizer
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 5:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]
There is a new pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.6.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 11200 bytes --]
From 2d4f4049687825cc507e7cfd0a8250b7e9235139 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.6.0.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 19 ---
.../files/musl-ppc-remove-glibc-dep.patch | 47 -------
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 13 +-
6 files changed, 4 insertions(+), 220 deletions(-)
delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..c40f558d8814 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.6.0_1
+libmariadbd.so.19 libmariadbclient-10.6.0_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e..000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int my_safe_print_str(const char* val, size_t max_len)
-+{
-+ printf("%*s\n", (int) max_len, val);
-+ return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
- char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb96..000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-- __ppc_get_timebase();
-+ __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
- __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
- return result;
- #elif defined(__powerpc__)
-- return __ppc_get_timebase();
-+ return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..b676d3f731da 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.6.0
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=1be60d640db8ce8c220237441e8b94e5d74c4cbdc3b0f7587bd0f64c86ba7653
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
@@ -35,15 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql"
-post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
- patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
- ;;
- esac
-}
-
do_check() {
cd build
if [ "$XBPS_CHECK_PKGS" = full ]; then
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.6.0.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
@ 2021-05-11 14:49 ` Veganizer
2021-05-11 14:50 ` mariadb: update to 10.5.10 Veganizer
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.6.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 11204 bytes --]
From 88076fda970705f6532a5ea554efae6cc57d5714 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 19 ---
.../files/musl-ppc-remove-glibc-dep.patch | 47 -------
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 13 +-
6 files changed, 4 insertions(+), 220 deletions(-)
delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e..000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int my_safe_print_str(const char* val, size_t max_len)
-+{
-+ printf("%*s\n", (int) max_len, val);
-+ return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
- char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb96..000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-- __ppc_get_timebase();
-+ __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
- __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
- return result;
- #elif defined(__powerpc__)
-- return __ppc_get_timebase();
-+ return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..7eed2542f5b2 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
@@ -35,15 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql"
-post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
- patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
- ;;
- esac
-}
-
do_check() {
cd build
if [ "$XBPS_CHECK_PKGS" = full ]; then
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
2021-05-11 14:49 ` [PR PATCH] [Updated] " Veganizer
@ 2021-05-11 14:50 ` Veganizer
2021-05-11 15:54 ` [PR PATCH] [Updated] " Veganizer
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by Veganizer on void-packages repository
https://github.com/void-linux/void-packages/pull/30794#issuecomment-838614293
Comment:
Did change it from 10.6.0 to 10.5.10, because 10.6.0 is alpha and should not be used in production.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
2021-05-11 14:49 ` [PR PATCH] [Updated] " Veganizer
2021-05-11 14:50 ` mariadb: update to 10.5.10 Veganizer
@ 2021-05-11 15:54 ` Veganizer
2021-05-11 15:56 ` Veganizer
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 15:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.5.10.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 8846 bytes --]
From 5d9c8dff6404eef4defef9caab4bb2d862e422cd Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 2 +-
.../files/musl-ppc-remove-glibc-dep.patch | 2 +-
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 4 +-
6 files changed, 6 insertions(+), 147 deletions(-)
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 4d87f57ddc9e..522130f62a48 100644
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,4 +1,4 @@
-https://jira.mariadb.org/browse/MDEV-24131
+ https://jira.mariadb.org/browse/MDEV-24131
--- ./unittest/mysys/stacktrace-t.c
+++ ./unittest/mysys/stacktrace-t.c
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
index 1346edebfb96..415873f98aea 100644
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -2,7 +2,7 @@
+++ ./include/my_cpu.h
@@ -24,17 +24,16 @@
*/
-
+
#ifdef _ARCH_PWR8
-#include <sys/platform/ppc.h>
/* Very low priority */
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..5e59c7b35a91 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (2 preceding siblings ...)
2021-05-11 15:54 ` [PR PATCH] [Updated] " Veganizer
@ 2021-05-11 15:56 ` Veganizer
2021-05-11 17:08 ` Veganizer
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.5.10.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 8346 bytes --]
From 513ad09b951844c90e9412333f7658b3b16ba5ad Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../files/musl-ppc-remove-glibc-dep.patch | 2 +-
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 4 +-
5 files changed, 5 insertions(+), 146 deletions(-)
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
index 1346edebfb96..415873f98aea 100644
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -2,7 +2,7 @@
+++ ./include/my_cpu.h
@@ -24,17 +24,16 @@
*/
-
+
#ifdef _ARCH_PWR8
-#include <sys/platform/ppc.h>
/* Very low priority */
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..5e59c7b35a91 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (3 preceding siblings ...)
2021-05-11 15:56 ` Veganizer
@ 2021-05-11 17:08 ` Veganizer
2021-05-11 17:12 ` Veganizer
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 17:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.5.10.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 12660 bytes --]
From a64dcf8b837e6d52f3c3096945837477e0e0b505 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 19 ---
.../files/musl-ppc-remove-glibc-dep.patch | 47 -------
srcpkgs/mariadb/patches/atomic-fix.patch | 16 +--
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 13 +-
7 files changed, 12 insertions(+), 228 deletions(-)
delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e..000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int my_safe_print_str(const char* val, size_t max_len)
-+{
-+ printf("%*s\n", (int) max_len, val);
-+ return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
- char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb96..000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-- __ppc_get_timebase();
-+ __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
- __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
- return result;
- #elif defined(__powerpc__)
-- return __ppc_get_timebase();
-+ return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
index 4ad06786f150..bb6d78c027dd 100644
--- a/srcpkgs/mariadb/patches/atomic-fix.patch
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -18,9 +18,9 @@ Date: Fri Dec 21 19:14:04 2018 +0200
James Cowgill <jcowgill@debian.org>
Jessica Clarke <jrtc27@debian.org>
---- configure.cmake
-+++ configure.cmake
-@@ -862,7 +862,25 @@ int main()
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -865,7 +865,25 @@ int main()
long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
@@ -47,9 +47,9 @@ Date: Fri Dec 21 19:14:04 2018 +0200
IF(WITH_VALGRIND)
SET(HAVE_valgrind 1)
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+--- a/mysys/CMakeLists.txt
++++ b/mysys/CMakeLists.txt
+@@ -168,6 +168,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
DTRACE_INSTRUMENT(mysys)
@@ -60,8 +60,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200
IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
+--- a/sql/CMakeLists.txt
++++ b/sql/CMakeLists.txt
@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
"${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
ENDIF()
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..7eed2542f5b2 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
@@ -35,15 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql"
-post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
- patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
- ;;
- esac
-}
-
do_check() {
cd build
if [ "$XBPS_CHECK_PKGS" = full ]; then
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (4 preceding siblings ...)
2021-05-11 17:08 ` Veganizer
@ 2021-05-11 17:12 ` Veganizer
2021-05-11 17:46 ` Veganizer
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.5.10.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 12114 bytes --]
From be8edeb9e16cbb89a8179e9fcefaa6305e1e97f8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 19 ---
.../files/musl-ppc-remove-glibc-dep.patch | 47 -------
srcpkgs/mariadb/patches/atomic-fix.patch | 4 +-
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 13 +-
7 files changed, 6 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e..000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int my_safe_print_str(const char* val, size_t max_len)
-+{
-+ printf("%*s\n", (int) max_len, val);
-+ return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
- char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb96..000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-- __ppc_get_timebase();
-+ __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
- __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
- return result;
- #elif defined(__powerpc__)
-- return __ppc_get_timebase();
-+ return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
index 4ad06786f150..83ea4edaa2b8 100644
--- a/srcpkgs/mariadb/patches/atomic-fix.patch
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -20,7 +20,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
--- configure.cmake
+++ configure.cmake
-@@ -862,7 +862,25 @@ int main()
+@@ -865,7 +865,25 @@ int main()
long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
@@ -49,7 +49,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
SET(HAVE_valgrind 1)
--- mysys/CMakeLists.txt
+++ mysys/CMakeLists.txt
-@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+@@ -168,6 +168,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
DTRACE_INSTRUMENT(mysys)
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..7eed2542f5b2 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
@@ -35,15 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql"
-post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
- patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
- ;;
- esac
-}
-
do_check() {
cd build
if [ "$XBPS_CHECK_PKGS" = full ]; then
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (5 preceding siblings ...)
2021-05-11 17:12 ` Veganizer
@ 2021-05-11 17:46 ` Veganizer
2021-05-11 18:06 ` Veganizer
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.5.10.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 13635 bytes --]
From 656848b1cd609c22de86a55824e9de79b5496404 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 19 ---
.../files/musl-ppc-remove-glibc-dep.patch | 47 -------
srcpkgs/mariadb/patches/atomic-fix.patch | 39 +++++-
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 13 +-
7 files changed, 41 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e..000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int my_safe_print_str(const char* val, size_t max_len)
-+{
-+ printf("%*s\n", (int) max_len, val);
-+ return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
- char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb96..000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-- __ppc_get_timebase();
-+ __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
- __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
- return result;
- #elif defined(__powerpc__)
-- return __ppc_get_timebase();
-+ return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
index 4ad06786f150..a09f6b609333 100644
--- a/srcpkgs/mariadb/patches/atomic-fix.patch
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -20,7 +20,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
--- configure.cmake
+++ configure.cmake
-@@ -862,7 +862,25 @@ int main()
+@@ -865,7 +865,25 @@ int main()
long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
@@ -49,7 +49,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
SET(HAVE_valgrind 1)
--- mysys/CMakeLists.txt
+++ mysys/CMakeLists.txt
-@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+@@ -168,6 +168,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
DTRACE_INSTRUMENT(mysys)
@@ -73,6 +73,41 @@ Date: Fri Dec 21 19:14:04 2018 +0200
FIND_PACKAGE(BISON 2.0)
+Forwarded: https://github.com/MariaDB/server/pull/1716
+From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
+Date: Thu, 10 Aug 2017 20:40:28 +0200
+Subject: mips-groonga-atomic
+ MIPS (and possibly other) platforms require linking against libatomic to
+ support 64-bit atomic integers. Groonga was failing to do so and all related
+ tests were failing with an atomics relocation error on MIPS.
+Author: James Cowgill <jcowgill@debian.org>
+---
+ storage/mroonga/vendor/groonga/CMakeLists.txt | 2 ++
+ storage/mroonga/vendor/groonga/lib/CMakeLists.txt | 1 +
+ 2 files changed, 3 insertions(+)
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt
++++ storage/mroonga/vendor/groonga/CMakeLists.txt
+@@ -237,6 +237,8 @@ endmacro()
+ include(build/ac_macros/check_headers.m4)
+ include(build/ac_macros/check_functions.m4)
+
++ac_check_lib(atomic __atomic_store_8)
++
+ ac_check_symbols(fpclassify math.h)
+ ac_check_lib(m fpclassify)
+
+--- storage/mroonga/vendor/groonga/lib/CMakeLists.txt
++++ storage/mroonga/vendor/groonga/lib/CMakeLists.txt
+@@ -90,6 +90,7 @@ endif()
+ set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga")
+
+ set(GRN_ALL_LIBRARIES
++ ${ATOMIC_LIBS}
+ ${EXECINFO_LIBS}
+ ${RT_LIBS}
+ ${PTHREAD_LIBS}
+
From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
Date: Thu, 9 Apr 2020 14:07:19 +0800
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..7eed2542f5b2 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
@@ -35,15 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql"
-post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
- patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
- ;;
- esac
-}
-
do_check() {
cd build
if [ "$XBPS_CHECK_PKGS" = full ]; then
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (6 preceding siblings ...)
2021-05-11 17:46 ` Veganizer
@ 2021-05-11 18:06 ` Veganizer
2021-05-12 12:00 ` Veganizer
2021-05-12 12:00 ` [PR PATCH] [Closed]: " Veganizer
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-11 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Veganizer against master on the void-packages repository
https://github.com/Veganizer/void-packages mariadb
https://github.com/void-linux/void-packages/pull/30794
mariadb: update to 10.5.10.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-30794.patch --]
[-- Type: text/x-diff, Size: 12114 bytes --]
From d8be75ace6307369bd4c0fb8d4c24d9174272d93 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 07:54:30 +0200
Subject: [PATCH] mariadb: update to 10.5.10.
---
common/shlibs | 4 +-
.../mariadb/files/musl-have-stacktrace.patch | 19 ---
.../files/musl-ppc-remove-glibc-dep.patch | 47 -------
srcpkgs/mariadb/patches/atomic-fix.patch | 4 +-
srcpkgs/mariadb/patches/cmake.patch | 15 ---
srcpkgs/mariadb/patches/fix-cross.patch | 126 ------------------
srcpkgs/mariadb/template | 13 +-
7 files changed, 6 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
delete mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
delete mode 100644 srcpkgs/mariadb/patches/cmake.patch
delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..fe7d3c527686 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
deleted file mode 100644
index 4d87f57ddc9e..000000000000
--- a/srcpkgs/mariadb/files/musl-have-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
---- ./unittest/mysys/stacktrace-t.c
-+++ ./unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int my_safe_print_str(const char* val, size_t max_len)
-+{
-+ printf("%*s\n", (int) max_len, val);
-+ return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
- char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
deleted file mode 100644
index 1346edebfb96..000000000000
--- a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./include/my_cpu.h
-+++ ./include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-- __ppc_get_timebase();
-+ __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- ./storage/tokudb/PerconaFT/portability/toku_time.h
-+++ ./storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
- __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
- return result;
- #elif defined(__powerpc__)
-- return __ppc_get_timebase();
-+ return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
index 4ad06786f150..83ea4edaa2b8 100644
--- a/srcpkgs/mariadb/patches/atomic-fix.patch
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -20,7 +20,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
--- configure.cmake
+++ configure.cmake
-@@ -862,7 +862,25 @@ int main()
+@@ -865,7 +865,25 @@ int main()
long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
@@ -49,7 +49,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
SET(HAVE_valgrind 1)
--- mysys/CMakeLists.txt
+++ mysys/CMakeLists.txt
-@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+@@ -168,6 +168,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
DTRACE_INSTRUMENT(mysys)
diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
deleted file mode 100644
index 27b4a507e23c..000000000000
--- a/srcpkgs/mariadb/patches/cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-caused configure error after update to cmake 3.20.1
-
-diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
-index b7bbbad..357b8ac 100644
---- libmariadb/cmake/ConnectorName.cmake
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index df46a2f2670a..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
-Date: Fri Apr 11 14:19:00 2021 +0200
-
- Fix cross-compile patch to consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
-
---- CMakeLists.txt.orig 2021-04-11 12:37:42.766483860 +0200
-+++ CMakeLists.txt 2021-04-11 13:05:49.491976374 +0200
-@@ -397,7 +397,7 @@
-
- CHECK_SYSTEMD()
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
- INCLUDE(${IMPORT_EXECUTABLES})
- ENDIF()
-@@ -479,7 +479,7 @@
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(extra/aws_sdk)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- SET(EXPORTED comp_err comp_sql factorial)
- IF(NOT WITHOUT_SERVER)
- SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
-
---- configure.cmake.orig 2021-04-11 13:45:39.143733089 +0200
-+++ configure.cmake 2021-04-11 13:46:06.378730316 +0200
-@@ -668,7 +668,7 @@
- " HAVE_PTHREAD_YIELD_ZERO_ARG)
-
- IF(NOT STACK_DIRECTION)
-- IF(CMAKE_CROSSCOMPILING)
-+ IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- MESSAGE(FATAL_ERROR
- "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 "
- "or -DSTACK_DIRECTION=-1 when calling cmake.")
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2021-04-11 13:48:22.249716484 +0200
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt 2021-04-11 13:49:44.050708156 +0200
-@@ -405,7 +405,7 @@
- set(MECAB_LIBRARIES libmecab)
- else()
- set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
-- if(NOT CMAKE_CROSSCOMPILING)
-+ if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
- endif()
- if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
-
---- storage/innobase/innodb.cmake.orig 2021-04-11 13:52:39.129690331 +0200
-+++ storage/innobase/innodb.cmake 2021-04-11 13:53:03.656687834 +0200
-@@ -36,7 +36,7 @@
-
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
--IF(CMAKE_CROSSCOMPILING)
-+IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
- # cross-compiling. Not as precise, but usually good enough.
- # This only make sense for atomic tests in this file, this trick doesn't
-
---- sql/CMakeLists.txt.orig 2021-04-11 13:54:43.469677673 +0200
-+++ sql/CMakeLists.txt 2021-04-11 13:55:46.337671272 +0200
-@@ -356,7 +356,7 @@
- COMPILE_FLAGS "-p ORA")
- ENDIF()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
- ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
- ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-@@ -406,7 +406,7 @@
- )
-
- # Install initial database (default on windows, optional target elsewhere)
--IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
-+IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- IF(GENERATOR_IS_MULTI_CONFIG)
- SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
- ENDIF()
-
---- scripts/CMakeLists.txt.orig 2021-04-11 13:57:30.088660710 +0200
-+++ scripts/CMakeLists.txt 2021-04-11 13:58:12.486656393 +0200
-@@ -28,14 +28,14 @@
- )
- ENDMACRO()
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- ADD_EXECUTABLE(comp_sql comp_sql.c)
- TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
-
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
--IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-+IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
- FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
- MARK_AS_ADVANCED(CAT_EXECUTABLE)
- ENDIF()
-
---- extra/CMakeLists.txt.orig 2021-04-11 14:02:55.048627626 +0200
-+++ extra/CMakeLists.txt 2021-04-11 14:03:24.136624665 +0200
-@@ -18,7 +18,7 @@
- # Default install component for the files is Server here
- SET(MYSQL_INSTALL_COMPONENT Server)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
- ENDIF()
-
---- dbug/CMakeLists.txt.orig 2021-04-11 14:12:39.744568100 +0200
-+++ dbug/CMakeLists.txt 2021-04-11 14:13:02.588565774 +0200
-@@ -25,7 +25,7 @@
- ADD_EXECUTABLE(tests tests.c)
- TARGET_LINK_LIBRARIES(tests dbug)
-
--IF(NOT CMAKE_CROSSCOMPILING)
-+IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
- ADD_EXECUTABLE(factorial my_main.c factorial.c)
- TARGET_LINK_LIBRARIES(factorial dbug)
- ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index db79671bf9dc..7eed2542f5b2 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
-version=10.5.9
+version=10.5.10
revision=1
build_style=cmake
build_helper=qemu
@@ -27,7 +27,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-2.0-only"
homepage="https://mariadb.com"
distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
lib32disabled=yes
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
@@ -35,15 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql"
-post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
- patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
- ;;
- esac
-}
-
do_check() {
cd build
if [ "$XBPS_CHECK_PKGS" = full ]; then
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (7 preceding siblings ...)
2021-05-11 18:06 ` Veganizer
@ 2021-05-12 12:00 ` Veganizer
2021-05-12 12:00 ` [PR PATCH] [Closed]: " Veganizer
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-12 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by Veganizer on void-packages repository
https://github.com/void-linux/void-packages/pull/30794#issuecomment-839713466
Comment:
/close because of atomic bug with armv6l-musl. Decided to wait for 10.6.0 getting non-alpha release.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: mariadb: update to 10.5.10.
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
` (8 preceding siblings ...)
2021-05-12 12:00 ` Veganizer
@ 2021-05-12 12:00 ` Veganizer
9 siblings, 0 replies; 11+ messages in thread
From: Veganizer @ 2021-05-12 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]
There's a closed pull request on the void-packages repository
mariadb: update to 10.5.10.
https://github.com/void-linux/void-packages/pull/30794
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-05-12 12:00 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-11 5:56 [PR PATCH] mariadb: update to 10.6.0 Veganizer
2021-05-11 14:49 ` [PR PATCH] [Updated] " Veganizer
2021-05-11 14:50 ` mariadb: update to 10.5.10 Veganizer
2021-05-11 15:54 ` [PR PATCH] [Updated] " Veganizer
2021-05-11 15:56 ` Veganizer
2021-05-11 17:08 ` Veganizer
2021-05-11 17:12 ` Veganizer
2021-05-11 17:46 ` Veganizer
2021-05-11 18:06 ` Veganizer
2021-05-12 12:00 ` Veganizer
2021-05-12 12:00 ` [PR PATCH] [Closed]: " Veganizer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).