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

[Brian Evans]

commit:     c38fe1abc758f3cb5718b67d0c5e5ebed31d2714
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 22:08:10 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 22:08:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38fe1ab

dev-db/mariadb: Fix file collisions and missing static binding

2 man files will collide with mysql-connector-c, removed

USE="galera" inadvertainly builds but does not install 2 dynamic libs
as they are meant to be static and the EAPI=7 cmake change causes issues
Make these libs static

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.1.41.ebuild |  5 +++++
 dev-db/mariadb/mariadb-10.2.26.ebuild |  5 +++++
 dev-db/mariadb/mariadb-10.3.17.ebuild |  5 +++++
 dev-db/mariadb/mariadb-10.4.7.ebuild  | 11 +++++++++++
 dev-db/mariadb/mariadb-5.5.65.ebuild  |  5 +++++
 5 files changed, 31 insertions(+)

diff --git a/dev-db/mariadb/mariadb-10.1.41.ebuild 
b/dev-db/mariadb/mariadb-10.1.41.ebuild
index 8a6a85ca423..40a3c6f6fd6 100644
--- a/dev-db/mariadb/mariadb-10.1.41.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.41.ebuild
@@ -267,6 +267,11 @@ src_prepare() {
        use oqgraph || _disable_engine oqgraph
        _disable_engine example
 
+       # Don't clash with dev-db/mysql-connector-c
+       sed -i -e 's/ my_print_defaults.1//' \
+               -e 's/ perror.1//' \
+               "${S}"/man/CMakeLists.txt || die
+
        cmake-utils_src_prepare
        java-pkg-opt-2_src_prepare
 }

diff --git a/dev-db/mariadb/mariadb-10.2.26.ebuild 
b/dev-db/mariadb/mariadb-10.2.26.ebuild
index 5e2edb0efa6..b43d53dfd0b 100644
--- a/dev-db/mariadb/mariadb-10.2.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.26.ebuild
@@ -305,6 +305,11 @@ src_prepare() {
                _disable_engine mroonga
        fi
 
+       # Don't clash with dev-db/mysql-connector-c
+       sed -i -e 's/ my_print_defaults.1//' \
+               -e 's/ perror.1//' \
+               "${S}"/man/CMakeLists.txt || die
+
        cmake-utils_src_prepare
        java-pkg-opt-2_src_prepare
 }

diff --git a/dev-db/mariadb/mariadb-10.3.17.ebuild 
b/dev-db/mariadb/mariadb-10.3.17.ebuild
index 958d9f1cb1e..d960aec7eba 100644
--- a/dev-db/mariadb/mariadb-10.3.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.17.ebuild
@@ -295,6 +295,11 @@ src_prepare() {
                _disable_engine mroonga
        fi
 
+       # Don't clash with dev-db/mysql-connector-c
+       sed -i -e 's/ my_print_defaults.1//' \
+               -e 's/ perror.1//' \
+               "${S}"/man/CMakeLists.txt || die
+
        cmake-utils_src_prepare
        java-pkg-opt-2_src_prepare
 }

diff --git a/dev-db/mariadb/mariadb-10.4.7.ebuild 
b/dev-db/mariadb/mariadb-10.4.7.ebuild
index ca6d9f79031..4ab8c38d372 100644
--- a/dev-db/mariadb/mariadb-10.4.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.7.ebuild
@@ -296,6 +296,17 @@ src_prepare() {
                _disable_engine mroonga
        fi
 
+       # Fix static bindings in galera replication
+       sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 
STATIC~' \
+               "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+       sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+               "${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+       # Don't clash with dev-db/mysql-connector-c
+       sed -i -e 's/ my_print_defaults.1//' \
+               -e 's/ perror.1//' \
+               "${S}"/man/CMakeLists.txt || die
+
        cmake-utils_src_prepare
        java-pkg-opt-2_src_prepare
 }

diff --git a/dev-db/mariadb/mariadb-5.5.65.ebuild 
b/dev-db/mariadb/mariadb-5.5.65.ebuild
index c09952b96da..25cab0615e8 100644
--- a/dev-db/mariadb/mariadb-5.5.65.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.65.ebuild
@@ -229,6 +229,11 @@ src_prepare() {
                _disable_engine oqgraph
        fi
 
+       # Don't clash with dev-db/mysql-connector-c
+       sed -i -e 's/ my_print_defaults.1//' \
+               -e 's/ perror.1//' \
+               "${S}"/man/CMakeLists.txt || die
+
        cmake-utils_src_prepare
 }