From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1103763-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6BC59138334
for <garchives@archives.gentoo.org>; Fri, 2 Aug 2019 22:08:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8BAFFE0814;
Fri, 2 Aug 2019 22:08:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 63947E0814
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Aug 2019 22:08:42 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C36DE349316
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Aug 2019 22:08:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FB905CB
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Aug 2019 22:08:39 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" <grknight@gentoo.org>
Message-ID: <1564783714.c38fe1abc758f3cb5718b67d0c5e5ebed31d2714.grknight@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mariadb/mariadb-10.1.41.ebuild dev-db/mariadb/mariadb-10.2.26.ebuild dev-db/mariadb/mariadb-10.3.17.ebuild dev-db/mariadb/mariadb-10.4.7.ebuild dev-db/mariadb/mariadb-5.5.65.ebuild
X-VCS-Directories: dev-db/mariadb/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: c38fe1abc758f3cb5718b67d0c5e5ebed31d2714
X-VCS-Branch: master
Date: Fri, 2 Aug 2019 22:08:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6e816239-72cf-490f-93a8-506fb76f5117
X-Archives-Hash: 1e374bf202d662470ff90d6ddde106c3
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
}