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 47837138247 for ; Wed, 6 Nov 2013 23:53:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A5F4E09B5; Wed, 6 Nov 2013 23:53:15 +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 A7BBEE09B5 for ; Wed, 6 Nov 2013 23:53:14 +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 8D31333EE89 for ; Wed, 6 Nov 2013 23:53:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3629EE545C for ; Wed, 6 Nov 2013 23:53:11 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1383781915.42144aa5a266c7afa3a1c81051ba53c2f5245ef9.jmbsvicetto@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-multilib.eclass eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 42144aa5a266c7afa3a1c81051ba53c2f5245ef9 X-VCS-Branch: master Date: Wed, 6 Nov 2013 23:53:11 +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: 0837f2e7-bc09-43eb-aa08-96380cac7551 X-Archives-Hash: 0bd0bf419482389a2cd26720ea1303b5 commit: 42144aa5a266c7afa3a1c81051ba53c2f5245ef9 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Wed Nov 6 23:51:55 2013 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Wed Nov 6 23:51:55 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=42144aa5 Don't try to apply patches if MY_EXTRAS_VER="none". Fixes bug 490352. --- eclass/mysql-autotools.eclass | 21 ++++++++++++--------- eclass/mysql-cmake-multilib.eclass | 21 ++++++++++++--------- eclass/mysql-cmake.eclass | 25 ++++++++++++++----------- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index c1af98e..2cfa3f2 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -377,15 +377,18 @@ mysql-autotools_src_prepare() { cd "${S}" - # Apply the patches for this MySQL version - EPATCH_SUFFIX="patch" - mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" - # Clean out old items - rm -f "${EPATCH_SOURCE}"/* - # Now link in right patches - mysql_mv_patches - # And apply - epatch + if [[ ${MY_EXTRAS_VER} != none ]]; then + + # Apply the patches for this MySQL version + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi # last -fPIC fixup, per bug #305873 i="${S}"/storage/innodb_plugin/plug.in diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass index 70e7169..6314193 100644 --- a/eclass/mysql-cmake-multilib.eclass +++ b/eclass/mysql-cmake-multilib.eclass @@ -222,15 +222,18 @@ mysql-cmake-multilib_src_prepare() { cd "${S}" - # Apply the patches for this MySQL version - EPATCH_SUFFIX="patch" - mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" - # Clean out old items - rm -f "${EPATCH_SOURCE}"/* - # Now link in right patches - mysql_mv_patches - # And apply - epatch + if [[ ${MY_EXTRAS_VER} != none ]]; then + + # Apply the patches for this MySQL version + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi # last -fPIC fixup, per bug #305873 i="${S}"/storage/innodb_plugin/plug.in diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 04f83ec..1b9985f 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -244,15 +244,18 @@ mysql-cmake_src_prepare() { cd "${S}" - # Apply the patches for this MySQL version - EPATCH_SUFFIX="patch" - mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" - # Clean out old items - rm -f "${EPATCH_SOURCE}"/* - # Now link in right patches - mysql_mv_patches - # And apply - epatch + if [[ ${MY_EXTRAS_VER} != none ]]; then + + # Apply the patches for this MySQL version + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi # last -fPIC fixup, per bug #305873 i="${S}"/storage/innodb_plugin/plug.in @@ -269,8 +272,8 @@ mysql-cmake_src_prepare() { if has tokudb ${IUSE} ; then # Don't build bundled xz-utils - rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" - touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" + rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" + touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" fi epatch_user