[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/

[Brian Evans]

commit:     611087170306cebf36dc64df52cd5d628472e75c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 20:38:13 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 20:38:13 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=61108717

dev-db/mariadb: Improve building on ABI_X86_32

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mariadb/ChangeLog             | 3 +++
 dev-db/mariadb/mariadb-10.2.6.ebuild | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index c50dd01..ff4783b 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  28 Jun 2017; Brian Evans <grkni...@gentoo.org> mariadb-10.2.6.ebuild:
+  dev-db/mariadb: Improve building on ABI_X86_32
+
   13 Jun 2017; Brian Evans <grkni...@gentoo.org> mariadb-9999.ebuild:
   dev-db/mariadb: Fix subslot of 9999
 

diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild 
b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 54a50f1..d719edc 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -32,10 +32,11 @@ fi
 
 #      "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
 #      "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-#      
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
 PATCHES=(
        "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
        "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
+       "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
 )
 
 COMMON_DEPEND="
@@ -113,8 +114,8 @@ src_configure(){
                        -DWITH_PCRE=system
        )
        local MYSQL_CMAKE_EXTRA_DEFINES=(
-                       -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
-                       -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos ON OFF)
+                       -DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)"
                        -DCONC_WITH_EXTERNAL_ZLIB=YES
                        -DWITH_EXTERNAL_ZLIB=YES
                        -DSUFFIX_INSTALL_DIR=""
@@ -127,6 +128,7 @@ src_configure(){
                        -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
                        -DINSTALL_SCRIPTDIR=share/mariadb/scripts
                        -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+                       -DWITH_UNITTEST=OFF
        )
 
        if use test ; then