| 1 |
commit: a7739a1ed0b8b28c2c82b3f4c0898fcade0c7d9e |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 31 02:39:30 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 31 02:39:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a7739a1e |
| 7 |
|
| 8 |
dev-db/mariadb: Update 10.2.6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 |
| 12 |
|
| 13 |
dev-db/mariadb/ChangeLog | 3 +++ |
| 14 |
dev-db/mariadb/mariadb-10.2.6.ebuild | 21 ++++++++++++++++++--- |
| 15 |
2 files changed, 21 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
| 18 |
index 036558a..061dbd4 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 |
+ 31 May 2017; Brian Evans <grknight@g.o> mariadb-10.2.6.ebuild: |
| 26 |
+ dev-db/mariadb: Update 10.2.6 |
| 27 |
+ |
| 28 |
29 May 2017; Brian Evans <grknight@g.o> mariadb-10.2.6.ebuild: |
| 29 |
dev-db/mariadb: Update with critical API patch |
| 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 81b323e..47ab4c3 100644 |
| 34 |
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 35 |
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild |
| 36 |
@@ -58,6 +58,8 @@ COMMON_DEPEND=" |
| 37 |
tokudb? ( app-arch/snappy ) |
| 38 |
) |
| 39 |
>=dev-libs/libpcre-8.35:3= |
| 40 |
+ net-misc/curl[${MULTILIB_USEDEP}] |
| 41 |
+ sys-libs/zlib[${MULTILIB_USEDEP}] |
| 42 |
" |
| 43 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
| 44 |
${COMMON_DEPEND}" |
| 45 |
@@ -141,10 +143,23 @@ src_configure(){ |
| 46 |
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
| 47 |
-DINSTALL_SQLBENCHDIR=share/mariadb |
| 48 |
) |
| 49 |
+ if use test ; then |
| 50 |
+ # This is needed for the new client lib which tests a real, open server |
| 51 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( -DSKIP_TESTS=ON ) |
| 52 |
+ fi |
| 53 |
fi |
| 54 |
mysql-multilib-r1_src_configure |
| 55 |
} |
| 56 |
|
| 57 |
+src_install() { |
| 58 |
+ mysql-multilib-r1_src_install |
| 59 |
+ install_compat_symlink() { |
| 60 |
+ use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a" |
| 61 |
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so" |
| 62 |
+ } |
| 63 |
+ multilib_foreach_abi install_compat_symlink |
| 64 |
+} |
| 65 |
+ |
| 66 |
# Official test instructions: |
| 67 |
# USE='embedded extraengine perl server openssl static-libs' \ |
| 68 |
# FEATURES='test userpriv -usersandbox' \ |
| 69 |
@@ -176,9 +191,9 @@ multilib_src_test() { |
| 70 |
addpredict /this-dir-does-not-exist/t9.MYI |
| 71 |
|
| 72 |
# Run CTest (test-units) |
| 73 |
-# cmake-utils_src_test |
| 74 |
-# retstatus_unit=$? |
| 75 |
-# [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 76 |
+ cmake-utils_src_test |
| 77 |
+ retstatus_unit=$? |
| 78 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 79 |
|
| 80 |
# Ensure that parallel runs don't die |
| 81 |
export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
Archives