commit: 946601057fe2b2ffb37013f0af01d2d50145650c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 19:58:52 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri May 20 19:59:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94660105
dev-db/mariadb: Fix header multilib mismatch wrt bug 582940
10.1.14 introduces private/probes_mysql_{,no}dtrace.h which are not the same
in a multilib installation. Mark them with MULTILIB_WRAP_HEADERS to fix
the mismatch
Package-Manager: portage-2.3.0_rc1
dev-db/mariadb/mariadb-10.1.14.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild
b/dev-db/mariadb/mariadb-10.1.14.ebuild
index 539f3c5..fbfc6f3 100644
--- a/dev-db/mariadb/mariadb-10.1.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.14.ebuild
@@ -73,7 +73,9 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
