summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2019-08-02 18:08:10 -0400
committerBrian Evans <grknight@gentoo.org>2019-08-02 18:08:34 -0400
commitc38fe1abc758f3cb5718b67d0c5e5ebed31d2714 (patch)
tree6a81a402e1058b9b6aacb422fc5e3d45c3726182 /dev-db/mariadb/mariadb-5.5.65.ebuild
parentdev-db/mysql-connector-c: sh keyworded (bug #556246) (diff)
downloadgentoo-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/mariadb/mariadb-5.5.65.ebuild')
-rw-r--r--dev-db/mariadb/mariadb-5.5.65.ebuild5
1 files changed, 5 insertions, 0 deletions
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
}