From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QBVrD-00019d-BG for garchives@archives.gentoo.org; Sun, 17 Apr 2011 17:33:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44EDF1C009; Sun, 17 Apr 2011 17:33:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F1BB41C009 for ; Sun, 17 Apr 2011 17:33:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6067B1B408B for ; Sun, 17 Apr 2011 17:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 70FA880065 for ; Sun, 17 Apr 2011 17:33:49 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <3570c9b45e392fb1cdb4b22d93ac2695467bbc47.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: 3570c9b45e392fb1cdb4b22d93ac2695467bbc47 Date: Sun, 17 Apr 2011 17:33:49 +0000 (UTC) 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: X-Archives-Hash: 614d562ad9cab2d958bea6910833d40e commit: 3570c9b45e392fb1cdb4b22d93ac2695467bbc47 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 17 17:33:42 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 17 17:33:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D3570c9b4 Fix up function names so that mysql-v2 can find them for correct building= . Signed-off-by: Robin H. Johnson gentoo.org> --- eclass/mysql-autotools.eclass | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclas= s index f0ccd66..aeda0f6 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -37,7 +37,7 @@ mysql-autotools_disable_test() { testname=3D"${rawtestname/*.}" mysql_disable_file=3D"${S}/mysql-test/t/disabled.def" #einfo "rawtestname=3D${rawtestname} testname=3D${testname} testsuite=3D= ${testsuite}" - echo ${testname} : ${reason} >> "${mysql_disable_file}" + echo "${testname} : ${reason}" >> "${mysql_disable_file}" =20 # ${S}/mysql-tests/t/disabled.def # @@ -66,7 +66,7 @@ mysql-autotools_disable_test() { fi } =20 -configure_minimal() { +mysql-autotools_configure_minimal() { =20 # These are things we exclude from a minimal build, please # note that the server actually does get built and installed, @@ -95,7 +95,7 @@ configure_minimal() { fi } =20 -configure_common() { +mysql-autotools_configure_common() { =20 myconf=3D"${myconf} $(use_with big-tables)" myconf=3D"${myconf} --enable-local-infile" @@ -146,7 +146,7 @@ configure_common() { =20 } =20 -configure_40_41_50() { +mysql-autotools_configure_40_41_50() { =20 myconf=3D"${myconf} $(use_with perl bench)" myconf=3D"${myconf} --enable-assembler" @@ -225,7 +225,7 @@ configure_40_41_50() { && myconf=3D"${myconf} --with-max-indexes=3D128" } =20 -configure_51() { +mysql-autotools_configure_51() { =20 # TODO: !!!! readd --without-readline # the failure depend upon config/ac-macros/readline.m4 checking into @@ -539,13 +539,13 @@ mysql-autotools_src_configure() { local myconf=3D"" =20 if use minimal ; then - configure_minimal + mysql-autotools_configure_minimal else - configure_common + mysql-autotools_configure_common if mysql_version_is_at_least "5.1.10" ; then - configure_51 + mysql-autotools_configure_51 else - configure_40_41_50 + mysql-autotools_configure_40_41_50 fi fi =20