From 4c254618987cf8ca1b32cd5488bf3f2929382b73 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 25 Dec 2009 18:23:14 +0000 Subject: [PATCH] add mysql 5.5 support git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@1742 6952d904-891a-0410-993b-d76249ca496b --- eclass/mysql.eclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 1fc7016..e75744b 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -63,6 +63,7 @@ fi # We also strip off upstream's trailing letter that they use to respin tarballs MYSQL_VERSION_ID="" +MY_PV="${PV/pre/m}" tpv="${PV%[a-z]}" tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" for vatom in 0 1 2 3 ; do @@ -87,6 +88,8 @@ elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then MYSQL_COMMUNITY_FEATURES=1 elif [ "${PV#5.4}" != "${PV}" ]; then MYSQL_COMMUNITY_FEATURES=1 +elif [ "${PV#5.5}" != "${PV}" ]; then + MYSQL_COMMUNITY_FEATURES=1 else MYSQL_COMMUNITY_FEATURES=0 fi @@ -138,10 +141,10 @@ PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})" if [ -z "${SERVER_URI}" ]; then # The community build is on the mirrors if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then - SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" + SERVER_URI="mirror://mysql/Downloads/MySQL-${MY_PV%.*}/mysql-${MY_PV//_/-}.tar.gz" # The (old) enterprise source is on the primary site only elif [ "${PN}" == "mysql" ]; then - SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" + SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV//_/-}.tar.gz" fi fi @@ -461,7 +464,7 @@ configure_51() { myconf="${myconf} --with-ndb-binlog" fi - if mysql_version_is_at_least "5.2" ; then + if mysql_version_is_at_least "6.0" ; then plugins="${plugins},falcon" fi