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@gentoo.org>

diff --git a/dev-db/mariadb/mariadb-10.1.41.ebuild b/dev-db/mariadb/mariadb-10.1.41.ebuild
index 8a6a85ca423ad9c1da8e68208d75187ca8254ee7..40a3c6f6fd67215b9486d5a03a120062f96aff9e 100644 (file)
--- 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 5e2edb0efa6bbcc53b72666723ed8d0d131c2d8b..b43d53dfd0b761dd36014fa9b8c96b621ef1d772 100644 (file)
--- 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 958d9f1cb1ed0f8783992c6e2c486bed4f8095a5..d960aec7eba8947196570f5310ae6b9c7a75b2c0 100644 (file)
--- 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 ca6d9f79031ec5b27f3a78450b37d6d6dfcd65d7..4ab8c38d3729cc08097f737a5c85eb42a0c359f9 100644 (file)
--- 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 c09952b96da129788bdf4f3ef6b70d553079f777..25cab0615e8299a4ed1039a1c212d55a85525606 100644 (file)
--- 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
 }