diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2014-04-24 03:01:34 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2014-04-24 03:01:34 +0000 |
| commit | c75ee957de891d148cbd01bc1a1efd9085409d3d (patch) | |
| tree | 57ff28896163ff970fb48724329c58a9c75183d4 /eclass | |
| parent | Bump (diff) | |
| download | historical-c75ee957de891d148cbd01bc1a1efd9085409d3d.tar.gz historical-c75ee957de891d148cbd01bc1a1efd9085409d3d.tar.bz2 historical-c75ee957de891d148cbd01bc1a1efd9085409d3d.zip | |
Sync changes from the mysql overlay - replace gcc version check by Brian Evans.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mysql-v2.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index d8cd61b9dd66..add053d7af73 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.27 2014/04/22 02:00:28 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.28 2014/04/24 03:01:34 jmbsvicetto Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -131,6 +131,7 @@ if [[ -z ${SERVER_URI} ]]; then MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" SERVER_URI=" http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz @@ -478,7 +479,7 @@ mysql-v2_pkg_setup() { mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup fi - if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then + if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." eerror "Please use gcc-config to switch to gcc-4.7 or later version." die |