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 6DC7F1387FD for ; Tue, 8 Apr 2014 02:17:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D165CE0B0D; Tue, 8 Apr 2014 02:17:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C7AFE0B0D for ; Tue, 8 Apr 2014 02:17:22 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D35933FF9C for ; Tue, 8 Apr 2014 02:17:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A888918873 for ; Tue, 8 Apr 2014 02:17:19 +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: <1396784842.b4e23e00dc25af07778b67472f32300f5801f814.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-multilib.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: b4e23e00dc25af07778b67472f32300f5801f814 X-VCS-Branch: master Date: Tue, 8 Apr 2014 02:17:19 +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: 68bbda54-bfb3-4fe4-8a4f-3c7c9a2f3b01 X-Archives-Hash: 5092b3aaf39725dfdc09aa36f96e982f commit: b4e23e00dc25af07778b67472f32300f5801f814 Author: Brian Evans tuffmail com> AuthorDate: Sun Apr 6 11:47:22 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Sun Apr 6 11:47:22 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4e23e00 [eclass] Add libpcre-8.35 dep for mariadb 10 Signed-off-by: Brian Evans tuffmail.com> --- eclass/mysql-cmake.eclass | 3 +-- eclass/mysql-multilib.eclass | 9 ++++----- eclass/mysql-v2.eclass | 9 ++++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 96f89b8..81159ac 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -332,8 +332,7 @@ mysql-cmake_src_configure() { else mycmakeargs+=( -DWITH_JEMALLOC=no ) fi - # TODO: uncomment this when libpcre 8.35 is released to remove bundled library -# mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system ) + mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) fi configure_cmake_locale diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 7814b2d..7eb14bf 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -239,11 +239,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then " fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" - # TODO: uncomment this when libpcre 8.35 is released to remove bundled library -# if mysql_version_is_at_least "10.0.9" ; then -# use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs?]" || \ -# DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" -# fi + if mysql_version_is_at_least "10.0.9" ; then + use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \ + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" + fi fi # Having different flavours at the same time is not a good idea diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 3a04875..67f9499 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -272,11 +272,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then " fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" - # TODO: uncomment this when libpcre 8.35 is released to remove bundled library -# if mysql_version_is_at_least "10.0.9" ; then -# use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs?]" || \ -# DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" -# fi + if mysql_version_is_at_least "10.0.9" ; then + use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \ + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" + fi fi # Having different flavours at the same time is not a good idea