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 15D2A1381F3 for ; Sat, 24 Nov 2012 19:41:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE98B21C08F; Sat, 24 Nov 2012 19:41:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DD4221C08F for ; Sat, 24 Nov 2012 19:41:39 +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 683EA33D941 for ; Sat, 24 Nov 2012 19:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CCB83E5436 for ; Sat, 24 Nov 2012 19:41:36 +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: <1353785953.5858151f49c03555f4befbb3dd29ac357dd01abe.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 5858151f49c03555f4befbb3dd29ac357dd01abe X-VCS-Branch: master Date: Sat, 24 Nov 2012 19:41:36 +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: f4f96fc4-1cd2-4b8a-85ce-42bcc4aa6b2d X-Archives-Hash: a7521a389768b77f900a9c774d92f4af commit: 5858151f49c03555f4befbb3dd29ac357dd01abe Author: Fabio Erculiani gentoo org> AuthorDate: Sat Nov 24 19:39:13 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Nov 24 19:39:13 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5858151f mysql-autotools: google-mysql configure The Google builds of MySQL are very specific about which MySQL should be used, as well as needing to use the system copies of perftools & lzo2. Also these builds need C++ implicit templates, so ensure that we don't pass -fno-implicit-templates to the compiler. Signed-off-by: Robin H. Johnson gentoo.org> --- eclass/mysql-autotools.eclass | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index f3aa85e..822ae9d 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -301,6 +301,18 @@ mysql-autotools_configure_51() { plugins_sta="${plugins_sta} ${plugins_dyn}" && \ plugins_dyn="" + # Google MySQL, bundle what upstream supports + if [[ "${PN}" == "google-mysql" ]]; then + for x in innobase innodb_plugin innodb ; do + plugins_sta="${plugins_sta//$x}" + plugins_dyn="${plugins_dyn//$x}" + done + plugins_sta="${plugins_sta} innodb_plugin googlestats" + myconf="${myconf} --with-perftools-dir=/usr --enable-perftools-tcmalloc" + # use system lzo for google-mysql + myconf="${myconf} --with-lzo2-dir=/usr" + fi + einfo "Available plugins: ${plugins_avail}" einfo "Dynamic plugins: ${plugins_dyn}" einfo "Static plugins: ${plugins_sta}" @@ -461,7 +473,11 @@ mysql-autotools_src_configure() { CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" + # storage/googlestats, sql/ in google-mysql are using C++ templates + # implicitly. Upstream might be interested in this, exclude + # -fno-implicit-templates for google-mysql for now. mysql_version_is_at_least "5.0" \ + && [[ "${PN}" != "google-mysql" ]] \ && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" export CXXFLAGS