diff options
| author |   Brian Evans <grknight@gentoo.org> | 2019-08-02 18:08:10 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2019-08-02 18:08:34 -0400 |
| commit | c38fe1abc758f3cb5718b67d0c5e5ebed31d2714 (patch) | |
| tree | 6a81a402e1058b9b6aacb422fc5e3d45c3726182 /dev-db | |
| parent | dev-db/mysql-connector-c: sh keyworded (bug #556246) (diff) | |
| download | gentoo-c38fe1abc758f3cb5718b67d0c5e5ebed31d2714.tar.gz gentoo-c38fe1abc758f3cb5718b67d0c5e5ebed31d2714.tar.bz2 gentoo-c38fe1abc758f3cb5718b67d0c5e5ebed31d2714.zip | |
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>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.1.41.ebuild | 5 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.26.ebuild | 5 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.3.17.ebuild | 5 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.4.7.ebuild | 11 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-5.5.65.ebuild | 5 |
5 files changed, 31 insertions, 0 deletions
diff --git a/dev-db/mariadb/mariadb-10.1.41.ebuild b/dev-db/mariadb/mariadb-10.1.41.ebuild index 8a6a85ca423a..40a3c6f6fd67 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 5e2edb0efa6b..b43d53dfd0b7 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 958d9f1cb1ed..d960aec7eba8 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 ca6d9f79031e..4ab8c38d3729 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 c09952b96da1..25cab0615e82 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 } |