From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LdMlU-00040p-Hz for garchives@archives.gentoo.org; Sat, 28 Feb 2009 10:49:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F176DE03A3; Sat, 28 Feb 2009 10:49:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D1F9EE03A3 for ; Sat, 28 Feb 2009 10:49:51 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id D2B2A6437A for ; Sat, 28 Feb 2009 10:49:50 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LdMlS-0003i6-Gp for gentoo-commits@lists.gentoo.org; Sat, 28 Feb 2009 10:49:50 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: mysql.eclass X-VCS-Directories: eclass X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Sat, 28 Feb 2009 10:49:50 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f13fb7d2-2015-44db-82f4-70c4de6b5aa9 X-Archives-Hash: 3502c2b5e839629cf6dd856a610cb198 robbat2 09/02/28 10:49:50 Modified: mysql.eclass Log: Back in 2006 we updated 4.1 and 5.0 per upstreams request that InnoDB w= as always build. However 5.1 never got updated, so do it now. Revision Changes Path 1.107 eclass/mysql.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.107&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.107&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?r1=3D1.106&r2=3D1.107 Index: mysql.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v retrieving revision 1.106 retrieving revision 1.107 diff -p -w -b -B -u -u -r1.106 -r1.107 --- mysql.eclass 11 Feb 2009 11:29:48 -0000 1.106 +++ mysql.eclass 28 Feb 2009 10:49:50 -0000 1.107 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.106 2009/02/1= 1 11:29:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.107 2009/02/2= 8 10:49:50 robbat2 Exp $ =20 # Author: Francesco Riosa (Retired) # Maintainer: MySQL Team @@ -74,7 +74,7 @@ mysql_version_is_at_least "5.1" \ =20 # compile-time-only mysql_version_is_at_least "5.1.12" \ -&& DEPEND=3D"${DEPEND} innodb? ( >=3Ddev-util/cmake-2.4.3 )" +&& DEPEND=3D"${DEPEND} >=3Ddev-util/cmake-2.4.3" =20 # BitKeeper dependency, compile-time only [[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND=3D"${DEPEND} dev-util/bk_client" @@ -126,9 +126,6 @@ mysql_version_is_at_least "5.0.18" \ && IUSE=3D"${IUSE} max-idx-128" =20 mysql_version_is_at_least "5.1" \ -&& IUSE=3D"${IUSE} innodb" - -mysql_version_is_at_least "5.1" \ || IUSE=3D"${IUSE} berkdb" =20 mysql_version_is_at_least "5.1.12" \ @@ -441,9 +438,8 @@ configure_51() { elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.htm= l" fi =20 - if use innodb ; then + # Upstream specifically requests that InnoDB always be built. plugins=3D"${plugins},innobase" - fi =20 # like configuration=3Dmax-no-ndb if use cluster ; then @@ -584,8 +580,7 @@ mysql_src_unpack() { if mysql_version_is_at_least "5.1.12" ; then rebuilddirlist=3D"." # TODO: check this with a cmake expert - use innodb \ - && cmake \ + cmake \ -DCMAKE_C_COMPILER=3D$(type -P $(tc-getCC)) \ -DCMAKE_CXX_COMPILER=3D$(type -P $(tc-getCXX)) \ "storage/innobase"