summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2019-01-08 17:28:07 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2019-01-09 22:47:12 +0100
commit13bc3e2161aeba82e9d461c379fb2cc8adc0da5a (patch)
tree348e784a6525db7f76ebbb51721a0cf42340e565
parentbaeb4a0249eb6843cdde5bb10e2a0d61667d5690 (diff)
downloadnet-13bc3e2161aeba82e9d461c379fb2cc8adc0da5a.tar.gz
net-13bc3e2161aeba82e9d461c379fb2cc8adc0da5a.tar.xz
mariadb: Drop 10.1.x
-rw-r--r--packages/dev-db/mariadb/mariadb-10.1.33-r1.exheres-012
-rw-r--r--packages/dev-db/mariadb/mariadb.exlib73
2 files changed, 25 insertions, 60 deletions
diff --git a/packages/dev-db/mariadb/mariadb-10.1.33-r1.exheres-0 b/packages/dev-db/mariadb/mariadb-10.1.33-r1.exheres-0
deleted file mode 100644
index 6272c9e..0000000
--- a/packages/dev-db/mariadb/mariadb-10.1.33-r1.exheres-0
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2013 Pierre Lejeune <superheron@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require mariadb
-
-PLATFORMS="~amd64 ~armv7"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PN}-Add-FindSnappy.cmake.patch
- "${FILES}"/${PN}-Allow-build-a-system-snappy.patch
-)
-
diff --git a/packages/dev-db/mariadb/mariadb.exlib b/packages/dev-db/mariadb/mariadb.exlib
index 83c2ace..4ce588e 100644
--- a/packages/dev-db/mariadb/mariadb.exlib
+++ b/packages/dev-db/mariadb/mariadb.exlib
@@ -30,17 +30,13 @@ MYOPTIONS="
lz4 [[ description = [ Use LZ4 compression for some storage engines ] ]]
systemd [[ description = [ Compile with systemd socket activation and notification ] ]]
tcpd
+ tokudb [[ description = [ Build the TokuDB high-performance storage engine ] ]]
+ zstd [[ description = [ Use Zstandard compression for some storage engines ] ]]
+
kerberos? ( ( providers: heimdal krb5 ) [[ number-selected = exactly-one ]] )
( providers: libressl openssl ) [[ number-selected = exactly-one ]]
"
-if ever at_least 10.2.11 ; then
- MYOPTIONS+="
- tokudb [[ description = [ Build the TokuDB high-performance storage engine ] ]]
- zstd [[ description = [ Use Zstandard compression for some storage engines ] ]]
- "
-fi
-
# TODO: Unbundle xz - https://tokutek.atlassian.net/browse/FT-313
DEPENDENCIES="
build+:
@@ -71,6 +67,8 @@ DEPENDENCIES="
providers:openssl? ( dev-libs/openssl )
systemd? ( sys-apps/systemd )
tcpd? ( sys-apps/tcp-wrappers )
+ tokudb? ( dev-libs/jemalloc )
+ zstd? ( app-arch/zstd[>=1.1.3] )
!dev-db/mysql [[
description = [ MariaDB is a drop-in replacement for MySQL with same binary names ]
resolution = uninstall-blocked-after
@@ -83,14 +81,6 @@ DEPENDENCIES="
app-admin/logrotate [[ description = [ Use logrotate for rotating logs ] ]]
"
-if ever at_least 10.2.16 ; then
- DEPENDENCIES+="
- build+run:
- tokudb? ( dev-libs/jemalloc )
- zstd? ( app-arch/zstd[>=1.1.3] )
- "
-fi
-
mariadb_pkg_pretend() {
# Sanity check when upgrading to a different x.y version of mysql
if [[ -z ${MARIADB_MAJOR_UPGRADE} ]] && has_version ${CATEGORY}/${PN} && \
@@ -119,12 +109,9 @@ mariadb_src_prepare() {
edo sed -e "/^MY_ADD_TEST(mf_iocache)/d" \
-i unittest/sql/CMakeLists.txt
- # TODO: report upstream
- if ever at_least 10.2.11 ; then
- edo sed \
- -e 's:DESTINATION "bin":DESTINATION ${INSTALL_BINDIR}:g' \
- -i libmariadb/mariadb_config/CMakeLists.txt
- fi
+ edo sed \
+ -e 's:DESTINATION "bin":DESTINATION ${INSTALL_BINDIR}:g' \
+ -i libmariadb/mariadb_config/CMakeLists.txt
}
mariadb_src_configure() {
@@ -166,6 +153,7 @@ mariadb_src_configure() {
-DMYSQL_UNIX_ADDR:PATH=/run/mysqld/mysqld.sock
-DSYSCONFDIR:PATH=/etc/mysql
# MongoDB C driver - commented out at the moment, but to be safe
+ -DAWS_SDK_EXTERNAL_PROJECT:BOOL=FALSE
-DCONNECT_WITH_MONGO:BOOL=FALSE
-DCONNECT_WITH_ZIP:BOOL=TRUE
-DENABLE_DTRACE:BOOL=FALSE
@@ -176,6 +164,10 @@ mariadb_src_configure() {
-DGRN_WITH_MESSAGE_PACK:BOOL=FALSE
-DGRN_WITH_MRUBY:BOOL=FALSE
-DGRN_WITH_ZEROMQ:BOOL=FALSE
+ # Mroonga requires external tools (http://groonga.org)
+ -DPLUGIN_MROONGA:STRING=NO
+ # The new client library API_TESTS require a real running server
+ -DSKIP_TESTS:BOOL=TRUE
-DWITH_EXTRA_CHARSETS:STRING=all
# Default ENGINES for MariaDB 5.6 community build (currently == xlarge) minus embedded
-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=TRUE
@@ -201,43 +193,28 @@ mariadb_src_configure() {
-DCMAKE_RANLIB:PATH=$(exhost --tool-prefix)gcc-ranlib
$(cmake_option jdbc CONNECT_WITH_JDBC)
-DGRN_WITH_LZ4:STRING=$(option lz4 && echo 'yes' || echo 'no')
+ -DGRN_WITH_ZSTD:STRING=$(option zstd && echo 'yes' || echo 'no')
$(cmake_with lz4 INNODB_LZ4)
-DPLUGIN_AUTH_GSSAPI:STRING=$(option kerberos && echo 'DYNAMIC' || echo 'NO')
+ -DPLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(option kerberos && echo 'DYNAMIC' || echo 'OFF')
+ -DWITH_ROCKSDB_LZ4:STRING=$(option lz4 && echo 'ON' || echo 'OFF')
+ -DWITH_ROCKSDB_ZSTD:STRING=$(option zstd && echo 'ON' || echo 'OFF')
$(cmake_with systemd)
$(cmake_disable_find kerberos GSSAPI)
)
- if ever at_least 10.2.19 ; then
+ if option tokudb ; then
cmakeargs+=(
- -DAWS_SDK_EXTERNAL_PROJECT:BOOL=FALSE
- -DPLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(option kerberos && echo 'DYNAMIC' || echo 'OFF')
- # Mroonga requires external tools (http://groonga.org)
- -DPLUGIN_MROONGA:STRING=NO
- # The new client library API_TESTS require a real running server
- -DSKIP_TESTS:BOOL=TRUE
- -DGRN_WITH_ZSTD:STRING=$(option zstd && echo 'yes' || echo 'no')
- -DWITH_ROCKSDB_LZ4:STRING=$(option lz4 && echo 'ON' || echo 'OFF')
- -DWITH_ROCKSDB_ZSTD:STRING=$(option zstd && echo 'ON' || echo 'OFF')
+ # See https://jira.mariadb.org/browse/MDEV-14524
+ -DTOKUDB_OK:BOOL=TRUE
+ -DPLUGIN_TOKUDB:STRING=YES
+ # TokuDB is enabled, but jemalloc is not. This configuration is not supported
+ -DWITH_JEMALLOC:STRING=system
+ -DWITH_SAFEMALLOC:BOOL=FALSE
)
-
- if option tokudb ; then
- cmakeargs+=(
- # See https://jira.mariadb.org/browse/MDEV-14524
- -DTOKUDB_OK:BOOL=TRUE
- -DPLUGIN_TOKUDB:STRING=YES
- # TokuDB is enabled, but jemalloc is not. This configuration is not supported
- -DWITH_JEMALLOC:STRING=system
- -DWITH_SAFEMALLOC:BOOL=FALSE
- )
- else
- cmakeargs+=(
- -DPLUGIN_TOKUDB:STRING=NO
- -DWITH_JEMALLOC:BOOL=FALSE
- )
- fi
else
cmakeargs+=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(option kerberos && echo 'DYNAMIC' || echo 'NO')
+ -DPLUGIN_TOKUDB:STRING=NO
-DWITH_JEMALLOC:BOOL=FALSE
)
fi