* [gentoo-commits] gentoo-x86 commit in eclass: mysql-autotools.eclass mysql-v2.eclass
@ 2012-04-18 2:08 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2012-04-18 2:08 UTC (permalink / raw
To: gentoo-commits
robbat2 12/04/18 02:08:34
Modified: mysql-autotools.eclass mysql-v2.eclass
Log:
Port changes from MySQL overlay. Drops old mysql-community, mysql-cluster. Fixes build of new PBXT, MariaDB and other bits.
Revision Changes Path
1.6 eclass/mysql-autotools.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-autotools.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-autotools.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-autotools.eclass?r1=1.5&r2=1.6
Index: mysql-autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -w -b -B -u -u -r1.5 -r1.6
--- mysql-autotools.eclass 9 Jan 2012 10:42:19 -0000 1.5
+++ mysql-autotools.eclass 18 Apr 2012 02:08:34 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.5 2012/01/09 10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.6 2012/04/18 02:08:34 robbat2 Exp $
# @ECLASS: mysql-autotools.eclass
# @MAINTAINER:
@@ -123,7 +123,7 @@ mysql-autotools_configure_common() {
myconf="${myconf} --with-debug=full"
else
myconf="${myconf} --without-debug"
- if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ); then
+ if ( use cluster ); then
myconf="${myconf} --without-ndb-debug"
fi
fi
@@ -172,14 +172,12 @@ mysql-autotools_configure_51() {
# user's data is not accessible.
use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
- if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
myconf="${myconf} $(use_enable community community-features)"
if use community; then
myconf="${myconf} $(use_enable profiling)"
else
myconf="${myconf} --disable-profiling"
fi
- fi
# Scan for all available plugins
local plugins_avail="$(
@@ -219,11 +217,11 @@ mysql-autotools_configure_51() {
if [[ "${PN}" != "mariadb" ]] ; then
elog "Before using the Federated storage engine, please be sure to read"
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
- plugins_dyn="${plugins_sta} federatedx"
+ plugins_dyn="${plugins_dyn} federated"
else
elog "MariaDB includes the FederatedX engine. Be sure to read"
elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
- plugins_dyn="${plugins_sta} federated"
+ plugins_dyn="${plugins_dyn} federatedx"
fi
else
plugins_dis="${plugins_dis} partition federated"
@@ -240,7 +238,7 @@ mysql-autotools_configure_51() {
done
# like configuration=max-no-ndb
- if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
+ if ( use cluster ) ; then
plugins_sta="${plugins_sta} ndbcluster partition"
plugins_dis="${plugins_dis//partition}"
myconf="${myconf} --with-ndb-binlog"
@@ -289,7 +287,7 @@ mysql-autotools_configure_51() {
if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
use pbxt \
- && plugins_dyn="${plugins_dyn} pbxt" \
+ && plugins_sta="${plugins_sta} pbxt" \
|| plugins_dis="${plugins_dis} pbxt"
fi
@@ -366,12 +364,9 @@ mysql-autotools_src_prepare() {
i="${S}"/storage/innodb_plugin/plug.in
[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
- # Additional checks, remove bundled zlib (Cluster needs this, for static
- # memory management in zlib, leave available for Cluster)
- if [[ "${PN}" != "mysql-cluster" ]] ; then
+ # Additional checks, remove bundled zlib
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
@@ -402,7 +397,7 @@ mysql-autotools_src_prepare() {
popd >/dev/null
fi
- if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+ if pbxt_available && [[ "${PBXT_NEWSTYLE}" != "1" ]] && use pbxt ; then
einfo "Adding storage engine: PBXT"
pushd "${S}"/storage >/dev/null
i='pbxt'
1.15 eclass/mysql-v2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.14&r2=1.15
Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -p -w -b -B -u -u -r1.14 -r1.15
--- mysql-v2.eclass 9 Jan 2012 10:42:19 -0000 1.14
+++ mysql-v2.eclass 18 Apr 2012 02:08:34 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.14 2012/01/09 10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.15 2012/04/18 02:08:34 robbat2 Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -80,14 +80,6 @@ fi
# mysql_upgrade.
MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
- case $PV in
- 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
- esac
-fi
-
-
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
@@ -110,23 +102,6 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"
# This eclass should only be used with at least mysql-5.1.50
mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
-# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
-# @DESCRIPTION:
-# Specifiy if community features are available. Possible values are 1 (yes)
-# and 0 (no).
-# Community features are available in mysql-community
-# AND in the re-merged mysql-5.0.82 and newer
-if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
- MYSQL_COMMUNITY_FEATURES=1
-elif [ "${MYSQL_PV_MAJOR}" == "5.1" ]; then
- MYSQL_COMMUNITY_FEATURES=1
-elif mysql_version_is_at_least "5.4.0"; then
- MYSQL_COMMUNITY_FEATURES=1
-else
- MYSQL_COMMUNITY_FEATURES=0
-fi
-
-
# @ECLASS-VARIABLE: XTRADB_VER
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -141,7 +116,7 @@ fi
if [ -z "${SERVER_URI}" ]; then
[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
if [ "${PN}" == "mariadb" ]; then
- MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
+ MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})"
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
@@ -151,23 +126,14 @@ if [ -z "${SERVER_URI}" ]; then
http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
"
- # The community and cluster builds are on the mirrors
- elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
- if [[ "${PN}" == "mysql-cluster" ]] ; then
- URI_DIR="MySQL-Cluster"
- URI_FILE="mysql-cluster-gpl"
else
URI_DIR="MySQL"
URI_FILE="mysql"
- fi
URI_A="${URI_FILE}-${MY_PV}.tar.gz"
MIRROR_PV=$(get_version_component_range 1-2 ${PV})
# Recently upstream switched to an archive site, and not on mirrors
SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
- # The (old) enterprise source is on the primary site only
- elif [ "${PN}" == "mysql" ]; then
- SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
fi
fi
@@ -188,9 +154,6 @@ if [[ "${PN}" == "mariadb" ]]; then
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
fi
-if [[ "${PN}" == "mysql-community" ]]; then
- DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
-fi
LICENSE="GPL-2"
SLOT="0"
@@ -206,15 +169,11 @@ esac
IUSE="${IUSE} latin1"
IUSE="${IUSE} extraengine"
-if [[ ${PN} != "mysql-cluster" ]] ; then
IUSE="${IUSE} cluster"
-fi
IUSE="${IUSE} max-idx-128"
IUSE="${IUSE} berkdb"
-
-[[ ${MYSQL_COMMUNITY_FEATURES} == 1 ]] \
-&& IUSE="${IUSE} +community profiling"
+IUSE="${IUSE} +community profiling"
[[ ${PN} == "mariadb" ]] \
&& IUSE="${IUSE} libevent"
@@ -249,7 +208,7 @@ DEPEND="
&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
# Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
+for i in "mysql" "mariadb" ; do
[[ ${i} == ${PN} ]] ||
DEPEND="${DEPEND} !dev-db/${i}"
done
@@ -326,6 +284,8 @@ if pbxt_patch_available; then
PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
+fi
+
# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
# vs. built outside the dir
if pbxt_available; then
@@ -333,7 +293,6 @@ if pbxt_patch_available; then
IUSE="${IUSE} pbxt"
PBXT_NEWSTYLE=1
fi
-fi
if xtradb_patch_available; then
XTRADB_P="percona-xtradb-${XTRADB_VER}"
@@ -425,14 +384,10 @@ mysql-v2_pkg_setup() {
enewgroup mysql 60 || die "problem adding 'mysql' group"
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
- if [ "${PN}" != "mysql-cluster" ] && use cluster; then
+ if use cluster; then
ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
ewarn "5.1 series should NOT be put into production. In the near"
ewarn "future, it will be disabled from building."
- ewarn ""
- ewarn "If you need NDB support, you should instead move to the new"
- ewarn "mysql-cluster package that represents that upstream NDB"
- ewarn "development."
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql-autotools.eclass mysql-v2.eclass
@ 2013-01-28 2:13 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-01-28 2:13 UTC (permalink / raw
To: gentoo-commits
robbat2 13/01/28 02:13:05
Modified: mysql-autotools.eclass mysql-v2.eclass
Log:
Sync mysql eclasses from gentoo-mysql tree. Fixes: PBXT nice (#374349), MariaDB desc (#453934), REQUIRED_USED (#441700).
Revision Changes Path
1.14 eclass/mysql-autotools.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-autotools.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-autotools.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-autotools.eclass?r1=1.13&r2=1.14
Index: mysql-autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -p -w -b -B -u -u -r1.13 -r1.14
--- mysql-autotools.eclass 21 Jan 2013 00:04:34 -0000 1.13
+++ mysql-autotools.eclass 28 Jan 2013 02:13:05 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.13 2013/01/21 00:04:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.14 2013/01/28 02:13:05 robbat2 Exp $
# @ECLASS: mysql-autotools.eclass
# @MAINTAINER:
@@ -421,6 +421,8 @@ mysql-autotools_src_prepare() {
i='pbxt'
[ -d "${i}" ] && rm -rf "${i}"
cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
+ f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
+ [[ -f $f ]] && epatch "$f"
popd >/dev/null
fi
1.23 eclass/mysql-v2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.22&r2=1.23
Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -p -w -b -B -u -u -r1.22 -r1.23
--- mysql-v2.eclass 20 Jan 2013 02:23:10 -0000 1.22
+++ mysql-v2.eclass 28 Jan 2013 02:13:05 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.22 2013/01/20 02:23:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.23 2013/01/28 02:13:05 robbat2 Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -152,7 +152,7 @@ DESCRIPTION="A fast, multi-threaded, mul
HOMEPAGE="http://www.mysql.com/"
if [[ "${PN}" == "mariadb" ]]; then
HOMEPAGE="http://mariadb.org/"
- DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
+ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
fi
LICENSE="GPL-2"
SLOT="0"
@@ -192,6 +192,8 @@ if mysql_version_is_at_least "5.5"; then
IUSE="${IUSE} jemalloc tcmalloc"
fi
+REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+
mysql_version_is_at_least "5.5.7" \
&& IUSE="${IUSE} systemtap"
@@ -228,6 +230,11 @@ done
&& mysql_version_is_at_least "5.2.5" \
&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
+# Bug 441700 MariaDB >=5.3 include custom mytop
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.3" \
+&& DEPEND="${DEPEND} !dev-db/mytop"
+
mysql_version_is_at_least "5.5.7" \
&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
@@ -306,6 +313,7 @@ if pbxt_available; then
IUSE="${IUSE} pbxt"
PBXT_NEWSTYLE=1
+ REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
fi
if xtradb_patch_available; then
@@ -318,6 +326,7 @@ if xtradb_patch_available; then
XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
IUSE="${IUSE} xtradb"
+ REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
fi
#
@@ -367,33 +376,12 @@ mysql-v2_pkg_setup() {
fi
# Check for USE flag problems in pkg_setup
- if use static && use ssl ; then
- M="MySQL does not support being built statically with SSL support enabled!"
- eerror "${M}"
- die "${M}"
- fi
-
if ! mysql_version_is_at_least "5.2" \
&& use debug ; then
# Also in package.use.mask
die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
fi
- if ( use cluster || use extraengine || use embedded ) \
- && use minimal ; then
- M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
- eerror "${M}"
- die "${M}"
- fi
-
- if xtradb_patch_available \
- && use xtradb \
- && use embedded ; then
- M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
- eerror "${M}"
- die "${M}"
- fi
-
# This should come after all of the die statements
enewgroup mysql 60 || die "problem adding 'mysql' group"
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-28 2:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-18 2:08 [gentoo-commits] gentoo-x86 commit in eclass: mysql-autotools.eclass mysql-v2.eclass Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2013-01-28 2:13 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox