mariadb: update to 10.0.22.
This commit is contained in:
parent
95f34b08df
commit
abb0010c45
2 changed files with 6 additions and 29 deletions
|
@ -16,31 +16,6 @@
|
|||
#
|
||||
# Setup maintainer mode options. Platform checks are
|
||||
|
||||
--- ./storage/xtradb/CMakeLists.txt.orig 2015-09-17 11:17:04.967280099 -0400
|
||||
+++ ./storage/xtradb/CMakeLists.txt 2015-09-17 11:18:58.011276650 -0400
|
||||
@@ -455,12 +455,13 @@
|
||||
SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)
|
||||
ENDIF()
|
||||
|
||||
-IF(XTRADB_OK)
|
||||
- MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
|
||||
- DEFAULT
|
||||
- RECOMPILE_FOR_EMBEDDED
|
||||
- LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
|
||||
-ELSE()
|
||||
- MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
|
||||
+IF(WITH_XTRADB)
|
||||
+ IF(XTRADB_OK)
|
||||
+ MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
|
||||
+ DEFAULT
|
||||
+ RECOMPILE_FOR_EMBEDDED
|
||||
+ LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
|
||||
+ ELSE()
|
||||
+ MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
|
||||
+ ENDIF()
|
||||
ENDIF()
|
||||
-
|
||||
|
||||
--- ./storage/innobase/CMakeLists.txt.orig 2015-09-18 21:28:54.446428704 -0400
|
||||
+++ ./storage/innobase/CMakeLists.txt 2015-09-18 21:40:24.987436643 -0400
|
||||
@@ -15,6 +15,10 @@
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'mariadb'
|
||||
pkgname=mariadb
|
||||
version=10.0.21
|
||||
revision=2
|
||||
version=10.0.22
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DMYSQL_DATADIR=/var/lib/mysql
|
||||
-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
|
||||
|
@ -30,11 +30,13 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://mariadb.org/"
|
||||
license="GPL-2"
|
||||
distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz"
|
||||
checksum=4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545
|
||||
checksum=9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b
|
||||
CFLAGS="-w"
|
||||
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
configure_args+=" -DWITH_XTRADB=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
|
||||
# configure_args+=" -DWITH_XTRADB=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
|
||||
# configure_args+=" -DWITH_XTRADB=1 -DINNODB=1"
|
||||
configure_args+=" -DINNODB=1"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
|
|
Loading…
Reference in a new issue