summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2016-05-20 15:58:52 -0400
committerBrian Evans <grknight@gentoo.org>2016-05-20 15:59:22 -0400
commit946601057fe2b2ffb37013f0af01d2d50145650c (patch)
treef35c3b6ffbe724cac8e96616adca958261772ca8 /dev-db
parentdev-tex/biblatex: Version bump (diff)
downloadgentoo-946601057fe2b2ffb37013f0af01d2d50145650c.tar.gz
gentoo-946601057fe2b2ffb37013f0af01d2d50145650c.tar.bz2
gentoo-946601057fe2b2ffb37013f0af01d2d50145650c.zip
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
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mariadb/mariadb-10.1.14.ebuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
index 539f3c58a56..fbfc6f318f8 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