diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-07-29 17:59:21 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-07-29 17:59:21 +0000 |
| commit | 88e9e1708ab79c68e00edbbe8e0d8bfbb69ba09e (patch) | |
| tree | 0e5ba191dee3df41214a4bd7530b8540103de768 /eclass/mysql-autotools.eclass | |
| parent | Version bump, bug #505096 (diff) | |
| download | gentoo-2-88e9e1708ab79c68e00edbbe8e0d8bfbb69ba09e.tar.gz gentoo-2-88e9e1708ab79c68e00edbbe8e0d8bfbb69ba09e.tar.bz2 gentoo-2-88e9e1708ab79c68e00edbbe8e0d8bfbb69ba09e.zip | |
Sync mysql eclass from overlay.
Diffstat (limited to 'eclass/mysql-autotools.eclass')
| -rw-r--r-- | eclass/mysql-autotools.eclass | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 692790072d16..e9849382f0aa 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.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-autotools.eclass,v 1.19 2014/07/19 10:18:41 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.20 2014/07/29 17:59:21 robbat2 Exp $ # @ECLASS: mysql-autotools.eclass # @MAINTAINER: @@ -377,23 +377,29 @@ 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 [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" - # Additional checks, remove bundled zlib - rm -f "${S}/zlib/"*.[ch] - sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" + # Additional checks, remove bundled zlib (Cluster needs this, for static + # memory management in zlib, leave available for Cluster) + if [[ "${PN}" != "mysql-cluster" ]] ; then + rm -f "${S}/zlib/"*.[ch] + sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" + fi rm -f "scripts/mysqlbug" # Make charsets install in the right place @@ -606,7 +612,7 @@ mysql-autotools_src_install() { -e "s!= /var!= ${EPREFIX}/var!" \ "${FILESDIR}/${mycnf_src}" \ > "${TMPDIR}/my.cnf.ok" - use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok" + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" if use latin1 ; then sed -i \ -e "/character-set/s|utf8|latin1|g" \ |