diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-05-30 22:39:30 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-05-30 22:39:30 -0400 |
| commit | a7739a1ed0b8b28c2c82b3f4c0898fcade0c7d9e (patch) | |
| tree | 83e3d31510ffe91c4e957b7f1b892403b0b7a631 | |
| parent | virtual/mysql: Make repoman happy for virtual/mysql (diff) | |
| download | mysql-a7739a1e.tar.gz mysql-a7739a1e.tar.bz2 mysql-a7739a1e.zip | |
dev-db/mariadb: Update 10.2.6
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
| -rw-r--r-- | dev-db/mariadb/ChangeLog | 3 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.6.ebuild | 21 |
2 files changed, 21 insertions, 3 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index 036558a..061dbd4 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$ + 31 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild: + dev-db/mariadb: Update 10.2.6 + 29 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild: dev-db/mariadb: Update with critical API patch diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild index 81b323e..47ab4c3 100644 --- a/dev-db/mariadb/mariadb-10.2.6.ebuild +++ b/dev-db/mariadb/mariadb-10.2.6.ebuild @@ -58,6 +58,8 @@ COMMON_DEPEND=" tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= + net-misc/curl[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] " DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) ${COMMON_DEPEND}" @@ -141,10 +143,23 @@ src_configure(){ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) -DINSTALL_SQLBENCHDIR=share/mariadb ) + if use test ; then + # This is needed for the new client lib which tests a real, open server + MYSQL_CMAKE_NATIVE_DEFINES+=( -DSKIP_TESTS=ON ) + fi fi mysql-multilib-r1_src_configure } +src_install() { + mysql-multilib-r1_src_install + install_compat_symlink() { + use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a" + dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so" + } + multilib_foreach_abi install_compat_symlink +} + # Official test instructions: # USE='embedded extraengine perl server openssl static-libs' \ # FEATURES='test userpriv -usersandbox' \ @@ -176,9 +191,9 @@ multilib_src_test() { addpredict /this-dir-does-not-exist/t9.MYI # Run CTest (test-units) -# cmake-utils_src_test -# retstatus_unit=$? -# [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" # Ensure that parallel runs don't die export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |