summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-12-19 18:34:19 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-12-22 15:29:34 +0100
commit464b40a97966282fc76d2bf85bd49a6e89e2e762 (patch)
tree34abdf2548dc397ac75e787cb50c5b079840d5e5
parent2f2df3f24aebcf0fc72e434fa92492743b57b6d9 (diff)
downloadnet-464b40a97966282fc76d2bf85bd49a6e89e2e762.tar.gz
net-464b40a97966282fc76d2bf85bd49a6e89e2e762.tar.xz
mariadb: Version bump to 10.1.29
virtual/jdk is also slotted. Change-Id: Icd316f6f409d678904ec7d63a025de9f53ab197d
-rw-r--r--packages/dev-db/mariadb/mariadb-10.1.29.exheres-0 (renamed from packages/dev-db/mariadb/mariadb-10.1.28.exheres-0)0
-rw-r--r--packages/dev-db/mariadb/mariadb.exlib5
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/dev-db/mariadb/mariadb-10.1.28.exheres-0 b/packages/dev-db/mariadb/mariadb-10.1.29.exheres-0
index 3a3c9fc..3a3c9fc 100644
--- a/packages/dev-db/mariadb/mariadb-10.1.28.exheres-0
+++ b/packages/dev-db/mariadb/mariadb-10.1.29.exheres-0
diff --git a/packages/dev-db/mariadb/mariadb.exlib b/packages/dev-db/mariadb/mariadb.exlib
index 35c2403..d3c8ac6 100644
--- a/packages/dev-db/mariadb/mariadb.exlib
+++ b/packages/dev-db/mariadb/mariadb.exlib
@@ -59,7 +59,7 @@ DEPENDENCIES="
sys-libs/pam
sys-libs/zlib[>=1.2.3]
user/mysql
- jdbc? ( virtual/jdk[>=1.6] )
+ jdbc? ( virtual/jdk:=[>=1.6] )
kerberos? ( virtual/kerberos )
lz4? ( app-arch/lz4 )
providers:libressl? ( dev-libs/libressl:= )
@@ -192,9 +192,10 @@ mariadb_src_configure() {
-DCMAKE_AR:PATH=$(exhost --tool-prefix)gcc-ar
-DCMAKE_RANLIB:PATH=$(exhost --tool-prefix)gcc-ranlib
$(cmake_option jdbc CONNECT_WITH_JDBC)
- $(cmake_disable_find kerberos gssapi)
-DGRN_WITH_LZ4:STRING=$(option lz4 && 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 'NO')
$(cmake_with systemd)
)