| 1 |
commit: 611087170306cebf36dc64df52cd5d628472e75c |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 28 20:38:13 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 28 20:38:13 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=61108717 |
| 7 |
|
| 8 |
dev-db/mariadb: Improve building on ABI_X86_32 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
| 12 |
|
| 13 |
dev-db/mariadb/ChangeLog | 3 +++ |
| 14 |
dev-db/mariadb/mariadb-10.2.6.ebuild | 8 +++++--- |
| 15 |
2 files changed, 8 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
| 18 |
index c50dd01..ff4783b 100644 |
| 19 |
--- a/dev-db/mariadb/ChangeLog |
| 20 |
+++ b/dev-db/mariadb/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
+ 28 Jun 2017; Brian Evans <grknight@g.o> mariadb-10.2.6.ebuild: |
| 26 |
+ dev-db/mariadb: Improve building on ABI_X86_32 |
| 27 |
+ |
| 28 |
13 Jun 2017; Brian Evans <grknight@g.o> mariadb-9999.ebuild: |
| 29 |
dev-db/mariadb: Fix subslot of 9999 |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 33 |
index 54a50f1..d719edc 100644 |
| 34 |
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 35 |
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 36 |
@@ -32,10 +32,11 @@ fi |
| 37 |
|
| 38 |
# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch |
| 39 |
# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
| 40 |
-# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch |
| 41 |
PATCHES=( |
| 42 |
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
| 43 |
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch |
| 44 |
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch |
| 45 |
+ "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch |
| 46 |
) |
| 47 |
|
| 48 |
COMMON_DEPEND=" |
| 49 |
@@ -113,8 +114,8 @@ src_configure(){ |
| 50 |
-DWITH_PCRE=system |
| 51 |
) |
| 52 |
local MYSQL_CMAKE_EXTRA_DEFINES=( |
| 53 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF) |
| 54 |
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF) |
| 55 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos ON OFF) |
| 56 |
+ -DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)" |
| 57 |
-DCONC_WITH_EXTERNAL_ZLIB=YES |
| 58 |
-DWITH_EXTERNAL_ZLIB=YES |
| 59 |
-DSUFFIX_INSTALL_DIR="" |
| 60 |
@@ -127,6 +128,7 @@ src_configure(){ |
| 61 |
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin |
| 62 |
-DINSTALL_SCRIPTDIR=share/mariadb/scripts |
| 63 |
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" |
| 64 |
+ -DWITH_UNITTEST=OFF |
| 65 |
) |
| 66 |
|
| 67 |
if use test ; then |
Archives