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 6C7A413800E for ; Fri, 3 Aug 2012 17:38:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75741E052E; Fri, 3 Aug 2012 17:38:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 43AD8E052E for ; Fri, 3 Aug 2012 17:38:28 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC25F1B4049 for ; Fri, 3 Aug 2012 17:38:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6CF3CE543C for ; Fri, 3 Aug 2012 17:38:26 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1344014586.18be22bfd6eb70ca4ece6e74d0ecde3c0fa120dd.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 18be22bfd6eb70ca4ece6e74d0ecde3c0fa120dd X-VCS-Branch: master Date: Fri, 3 Aug 2012 17:38:26 +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: e1fc095c-33ee-42dd-b119-6d671dece5a1 X-Archives-Hash: 3bf146976fc40074c560937e398f31fd commit: 18be22bfd6eb70ca4ece6e74d0ecde3c0fa120dd Author: Brian Evans lavabit com> AuthorDate: Fri Aug 3 15:19:43 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Aug 3 17:23:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=18be22bf Fix readline detection in MariaDB. Bug #412851 Starting with releases after 2011-12-12, MariaDB requires --disable-distribution flag to be set in order to link with GPLv3 readline version 6 or greater --- eclass/mysql-autotools.eclass | 6 ++++++ eclass/mysql-cmake.eclass | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 35232b0..bed1254 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -96,6 +96,12 @@ mysql-autotools_configure_minimal() { myconf="${myconf} --with-charset=latin1" myconf="${myconf} --with-collation=latin1_swedish_ci" fi + + # MariaDB requires this flag in order to link to GPLv3 readline v6 or greater + # A note is added to the configure output + if [[ "${PN}" == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then + myconf="${myconf} --disable-distribution" + fi } # @FUNCTION: mysql-autotools_configure_common diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index cc427c7..897e170 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -248,6 +248,13 @@ mysql-cmake_src_configure() { -DWITHOUT_UNIT_TESTS=1 ) + # Bug 412851 + # MariaDB requires this flag to compile with GPLv3 readline linked + # Adds a warning about redistribution to configure + if [[ "${PN}" == "mariadb" ]] ; then + mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 ) + fi + configure_cmake_locale if use minimal ; then