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 128C21381F3 for ; Tue, 10 Sep 2013 16:38:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89A52E09B4; Tue, 10 Sep 2013 16:38:20 +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 B47F7E0831 for ; Tue, 10 Sep 2013 16:38:19 +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 9DAAF33EAF5 for ; Tue, 10 Sep 2013 16:38:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1AD15E468F for ; Tue, 10 Sep 2013 16:38:16 +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: <1378821717.3da23a1438c544e058a0f084c1dcfc9fded33bf7.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mysql-cluster/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql-cluster/metadata.xml dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild eclass/mysql-autotools.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ dev-db/mysql-cluster/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 3da23a1438c544e058a0f084c1dcfc9fded33bf7 X-VCS-Branch: master Date: Tue, 10 Sep 2013 16:38:16 +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: ee155071-cd67-4c70-82cb-3e0f13c18336 X-Archives-Hash: 77626d8cbc4d213e04dfedbd9ba739ca commit: 3da23a1438c544e058a0f084c1dcfc9fded33bf7 Author: Brian Evans lavabit com> AuthorDate: Fri Jul 19 18:55:54 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Sep 10 14:01:57 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3da23a14 [mysql-cluster] Upgrade 7.0.37 to mysql-v2 eclass and fix a couple QA issues --- dev-db/mysql-cluster/metadata.xml | 2 ++ dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild | 5 +++-- eclass/mysql-autotools.eclass | 9 ++++++--- eclass/mysql-v2.eclass | 8 ++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml index f9c087a..22c35e3 100644 --- a/dev-db/mysql-cluster/metadata.xml +++ b/dev-db/mysql-cluster/metadata.xml @@ -4,9 +4,11 @@ mysql Make tables contain up to 1.844E+19 rows + Add support for NDB clustering Enables the community features from upstream. Build embedded server (libmysqld) Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition) + Use dev-libs/jemalloc for allocations. Use LATIN1 encoding instead of UTF8 Raise the max index per table limit from 64 to 128 Install client programs only, no server diff --git a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild index 1e346f3..b944856 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild @@ -2,15 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI=4 MY_EXTRAS_VER="live" +BUILD="autotools" # PBXT PBXT_VERSION='1.0.11-6-pre-ga' # XtraDB PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10' -inherit toolchain-funcs mysql +inherit toolchain-funcs mysql-v2 # only to make repoman happy. it is really set in the eclass IUSE="$IUSE" diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 9d1ff91..c1af98e 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -391,9 +391,12 @@ mysql-autotools_src_prepare() { i="${S}"/storage/innodb_plugin/plug.in [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" - # Additional checks, remove bundled zlib - rm -f "${S}/zlib/"*.[ch] - sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" + # Additional checks, remove bundled zlib (Cluster needs this, for static + # memory management in zlib, leave available for Cluster) + if [[ "${PN}" != "mysql-cluster" ]] ; then + rm -f "${S}/zlib/"*.[ch] + sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" + fi rm -f "scripts/mysqlbug" # Make charsets install in the right place diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 81e5b56..1832786 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -83,6 +83,14 @@ fi # mysql_upgrade. MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" +# Cluster is a special case... +if [[ "${PN}" == "mysql-cluster" ]]; then + case $PV in + 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;; + 7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;; + esac +fi + # @ECLASS-VARIABLE: MYSQL_VERSION_ID # @DESCRIPTION: # MYSQL_VERSION_ID will be: