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 C2BA9138252 for ; Wed, 11 May 2016 18:55:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7F2B224052; Wed, 11 May 2016 18:55:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37A58224052 for ; Wed, 11 May 2016 18:55:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18A4E33FEDE for ; Wed, 11 May 2016 18:55:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E406632E for ; Wed, 11 May 2016 18:55:03 +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: <1462992889.3fe58ecd995db0c53fbcc56c124966a9363126f9.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 3fe58ecd995db0c53fbcc56c124966a9363126f9 X-VCS-Branch: master Date: Wed, 11 May 2016 18:55:03 +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: d09f4e60-5ed4-4e6a-a851-575879b8fb7e X-Archives-Hash: 4e14b7e8ee3abad1671a706d8a6d8db9 commit: 3fe58ecd995db0c53fbcc56c124966a9363126f9 Author: Brian Evans gentoo org> AuthorDate: Wed May 11 18:54:49 2016 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed May 11 18:54:49 2016 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3fe58ecd mysql-multilib-r1.eclass: Remove private header and don't install tests wrt bug 582738 eclass/mysql-multilib-r1.eclass | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index b18ebd0..40ef8f5 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -384,7 +384,6 @@ multilib_src_configure() { -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql - -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SBINDIR=sbin -DINSTALL_SCRIPTDIR=share/mysql/scripts @@ -404,6 +403,12 @@ multilib_src_configure() { -DENABLE_STATIC_LIBS=$(usex static-libs) ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + if in_iuse systemd ; then mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) ) fi @@ -537,11 +542,16 @@ mysql-multilib-r1_src_install() { multilib_src_install() { debug-print-function ${FUNCNAME} "$@" - if multilib_is_native_abi; then - # Make sure the vars are correctly initialized - mysql_init_vars + cmake-utils_src_install + # Make sure the vars are correctly initialized + mysql_init_vars + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then + rm "${D}${MY_INCLUDEDIR}/private/config.h" || die + fi - cmake-utils_src_install + if multilib_is_native_abi; then # Convenience links einfo "Making Convenience links for mysqlcheck multi-call binary" @@ -627,7 +637,6 @@ multilib_src_install() { fi done else - cmake-utils_src_install if [[ "${PN}" == "mariadb" ]] && use server ; then insinto /usr/include/mysql/private doins "${S}"/sql/*.h