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

diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
index 539f3c58a56298bd8c2a31c3ba94cb3ed4d6ce9f..fbfc6f318f81c519794aa9fcc220a18bbb587f72 100644 (file)
--- 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