dbp/mysql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add Brian Evans <grknight@scent-team.com> eclass mods

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@1832 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-01-12 21:45:05 +00:00
parent 55b35168ea
commit 1ac9631af7
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
eclass/mysql.eclass
View File

@ -20,6 +20,13 @@ WANT_AUTOMAKE="latest"
inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
inherit git
fi
case "${EAPI:-0}" in
2)
EXPORT_FUNCTIONS pkg_setup \
@ -46,13 +53,6 @@ esac
# and we will run a mysql server during test phase
S="${WORKDIR}/mysql"
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
inherit git
fi
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
@ -127,10 +127,6 @@ RDEPEND="${DEPEND}
mysql_version_is_at_least "5.1" \
|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
# compile-time-only
mysql_version_is_at_least "5.1.12" \
&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
@ -185,7 +181,7 @@ mysql_version_is_at_least "5.1" \
|| IUSE="${IUSE} berkdb"
mysql_version_is_at_least "5.1.26" \
|| IUSE="${IUSE} innodb xtradb"
&& IUSE="${IUSE} innodb xtradb dynamicplugins"
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
@ -439,7 +435,6 @@ configure_51() {
myconf="${myconf} --enable-assembler"
myconf="${myconf} --with-geometry"
myconf="${myconf} --with-readline"
myconf="${myconf} --with-row-based-replication"
myconf="${myconf} --with-zlib-dir=/usr"
myconf="${myconf} --without-pstack"
use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
@ -447,7 +442,7 @@ configure_51() {
# 5.1 introduces a new way to manage storage engines (#plugins)
# like configuration=none
local plugins="csv,myisam,myisammrg,heap"
if use extraengine ; then
if use extraengine && ! use dynamicplugins ; then
# like configuration=max-no-ndb, archive and example removed in 5.1.11
plugins="${plugins},archive,blackhole,example,federated,partition"
@ -471,7 +466,9 @@ configure_51() {
for str in ${STORAGE_IUSE} ; do
if use ${str} ; then
# dotn confuse autoconf by specifiing the plugins to or more times
[[ -d storage/${str} ]] && plugins="${plugins},${str}"
if ! use dynamicplugins ; then
[[ -d storage/${str} ]] && plugins="${plugins},${str}"
fi
# suppres error message
[[ ${str} = "innodb" ]] && str="innobase"
[[ ${str} = "xtradb" ]] && str="innobase"
@ -655,13 +652,7 @@ mysql_src_prepare() {
fi
if mysql_version_is_at_least "5.1.12" ; then
einfo "Updating innobase cmake"
rebuilddirlist="."
# TODO: check this with a cmake expert
cmake \
-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
"storage/innobase"
else
rebuilddirlist=". innobase"
fi