From: Veganizer <Veganizer@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mariadb: update to 10.5.10.
Date: Tue, 11 May 2021 17:56:42 +0200 [thread overview]
Message-ID: <20210511155642.IF1XIGVpdEHOHtOnItlFOnWQhjvBhYopY8F4jFmLeuQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30794@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2021-05-11 15:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210511155642.IF1XIGVpdEHOHtOnItlFOnWQhjvBhYopY8F4jFmLeuQ@z \
--to=veganizer@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).