summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2016-03-07 13:25:19 -0500
committerBrian Evans <grknight@gentoo.org>2016-03-07 13:25:19 -0500
commitdbbf77d2d983012bffbe8ae5d542a5fbe9f6b114 (patch)
tree67a7a4cc2c3a21827636cbe338024f72f2d2eee3
parentdev-db/mariadb: Version bump 10.1.12; first to use new EAPI6 (diff)
downloadmysql-dbbf77d2d983012bffbe8ae5d542a5fbe9f6b114.tar.gz
mysql-dbbf77d2d983012bffbe8ae5d542a5fbe9f6b114.tar.bz2
mysql-dbbf77d2d983012bffbe8ae5d542a5fbe9f6b114.zip
dev-db/mariadb: Copy multilib kerberos fixes from portage tree
Package-Manager: portage-2.2.27 Manifest-Sign-Key: D1F781EFF9F4A3B6
-rw-r--r--dev-db/mariadb/ChangeLog3
-rw-r--r--dev-db/mariadb/mariadb-10.1.12.ebuild4
2 files changed, 6 insertions, 1 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index f76ec81..2d51626 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 07 Mar 2016; Brian Evans <grknight@gentoo.org> mariadb-10.1.12.ebuild:
+ dev-db/mariadb: Copy multilib kerberos fixes from portage tree
+
*mariadb-10.1.12 (27 Feb 2016)
27 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.12.ebuild:
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
index d911253..198a9b2 100644
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
@@ -34,7 +34,7 @@ PATCHES=(
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5 )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:= )
!bindist? ( >=sys-libs/readline-4.1:0= )
server? (
@@ -79,6 +79,8 @@ src_configure(){
local MYSQL_CMAKE_NATIVE_DEFINES=(
-DWITH_JEMALLOC=$(usex jemalloc system)
-DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
)
if use server ; then