commit: 5c225bc06727e4007d265a472b6d04173af3ed01 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Apr 25 16:57:25 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Apr 25 16:57:25 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=5c225bc0
dev-db/mariadb-connector-c: Fix up mysqlcompat USE installs Package-Manager: Portage-2.3.5, Repoman-2.3.2 Manifest-Sign-Key: D1F781EFF9F4A3B6 dev-db/mariadb-connector-c/ChangeLog | 4 ++++ .../mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb-connector-c/ChangeLog b/dev-db/mariadb-connector-c/ChangeLog index 6f57011..3c5efcc 100644 --- a/dev-db/mariadb-connector-c/ChangeLog +++ b/dev-db/mariadb-connector-c/ChangeLog @@ -1,3 +1,7 @@ + 25 Apr 2017; Brian Evans <[email protected]> + mariadb-connector-c-3.0.1_beta.ebuild: + dev-db/mariadb-connector-c: Fix up mysqlcompat USE installs + *mariadb-connector-c-3.0.1_beta (25 Apr 2017) 25 Apr 2017; Brian Evans <[email protected]> +files/gentoo-layout-3.0.patch, diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild index 05f8f0d..89d8b33 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild @@ -75,7 +75,6 @@ multilib_src_configure() { local mycmakeargs=( -DWITH_EXTERNAL_ZLIB=ON -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) - -DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF) -DWITH_CURL=$(usex curl ON OFF) -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF) -DINSTALL_LIBDIR="$(get_libdir)" @@ -86,12 +85,20 @@ multilib_src_configure() { cmake-utils_src_configure } +multilib_src_install() { + cmake-utils_src_install + if use mysqlcompat ; then + dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 + dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so + fi +} + multilib_src_install_all() { if ! use static-libs ; then find "${D}" -name "*.a" -delete || die fi if use mysqlcompat ; then - dosym /usr/bin/mariadb_config /usr/bin/mysql_config + dosym mariadb_config /usr/bin/mysql_config dosym mariadb /usr/include/mysql fi }
