From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F40A138824 for ; Wed, 22 Oct 2014 19:35:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FD42E0838; Wed, 22 Oct 2014 19:35:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5897E0838 for ; Wed, 22 Oct 2014 19:35:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC009340278 for ; Wed, 22 Oct 2014 19:35:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52D3087D3 for ; Wed, 22 Oct 2014 19:35:21 +0000 (UTC) From: "Brian Evans" 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" Message-ID: <1413998277.01bcc9c442f1b13043196d5b1f35fcfa5ee6730a.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 01bcc9c442f1b13043196d5b1f35fcfa5ee6730a X-VCS-Branch: master Date: Wed, 22 Oct 2014 19:35:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e928f918-1ead-4ae1-b018-c793a97b4b61 X-Archives-Hash: 1919878b6ddef2cde272a2443d2af891 commit: 01bcc9c442f1b13043196d5b1f35fcfa5ee6730a Author: Brian Evans gentoo org> AuthorDate: Wed Oct 22 17:17:57 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Oct 22 17:17:57 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=01bcc9c4 Add another wrapped header for MariaDB 10.1 --- eclass/mysql-multilib.eclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index b7ff8af..da47f85 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -364,6 +364,9 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) # my_config.h includes ABI specific data MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) +[[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \ + MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) + # wrap the config script MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )