* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2011-03-17 3:15 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 8+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-17 3:15 UTC (permalink / raw
To: gentoo-commits
commit: b70aa96eee60d2e58693dc5754a9328a3478b0e5
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 03:14:05 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 03:14:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b70aa96e
Introduce new eclasses and update mysql_fx.eclass to support the cmake based mysql-5.5 ebuilds.
Add initial support for mysql-5.5.10 - this is still a work in progress.
---
dev-db/mysql/ChangeLog | 8 +
dev-db/mysql/Manifest | 4 +-
dev-db/mysql/mysql-5.5.10.ebuild | 201 ++++++++++
eclass/mysql-autotools.eclass | 729 ++++++++++++++++++++++++++++++++++++
eclass/mysql-cmake.eclass | 431 +++++++++++++++++++++
eclass/mysql-v2.eclass | 761 ++++++++++++++++++++++++++++++++++++++
6 files changed, 2133 insertions(+), 1 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 79ee0cc..efc8ea2 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mysql-5.5.10 (17 Mar 2011)
+
+ 17 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +mysql-5.5.10.ebuild:
+ Introduce new eclasses and update mysql_fx.eclass to support the cmake based
+ mysql-5.5 ebuilds.
+ Add initial support for mysql-5.5.10 - this is still a work in progress.
+
*mysql-5.0.92 (17 Feb 2011)
17 Feb 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 488c36b..bca7e10 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,6 +9,7 @@ DIST mysql-5.1.50.tar.gz 23750564 RMD160 5f4b6ac445ee386bb3004f0c27607283d011da3
DIST mysql-5.1.51.tar.gz 23830456 RMD160 033fc88fba226caf2ec6a34ac3875deab3006f42 SHA1 45aa05a6a70d67b379272ec19ad3023230c94079 SHA256 39d962222f068c426d4616950f0e8451d947a132f0c42af17a2fc8b3b5a42882
DIST mysql-5.1.52.tar.gz 23841760 RMD160 5809c7a5932a014fe412ddc5b9f15632c7367c27 SHA1 5ed4a3c12662b0329df870f4dcebea6903e94265 SHA256 b1c458b68aaf7b7745453c27b615ffc59cd213453ee78bc6b477b0f40df83917
DIST mysql-5.1.53.tar.gz 23871815 RMD160 e8fd69450dda85cf3f41269e6e3fca05caccc76d SHA1 24064a4c0f8b88b30acb6ddb03f32e897ef061f3 SHA256 d68c0db580bb514bb1759d4c69dc71ceb0e3573ac88a1025111bdd8f89e234a4
+DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
DIST mysql-5.5.4-m3.tar.gz 22761869 RMD160 502f5d4731abae86fa280f657a51bf3a9567e8a4 SHA1 5ea4e6a0385569654ab3e45ab0137ca16637594d SHA256 d1c45dd628593c6f872b234a28889bf249bdc872c4f4e3c91afff8ebda18e764
DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
@@ -22,6 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
+EBUILD mysql-5.5.10.ebuild 6907 RMD160 3cd815a40143d33e9a939c8d0937d0da550a6f9e SHA1 8ae70da5b59b6ed898fe6a50924d1db08542902e SHA256 24d9f7a4de939177eee9f334c086ba2144c897cb508f93256b6ffee650456be9
EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 3850 RMD160 dd70e610e6a0c7ebba50d3938bb89462b443c858 SHA1 2f1f30af90b1a6f0896a3ff00dee7008199970db SHA256 2dcd57dfaafff30655ed97b6677eec82e31b9218d8a9955ae9bf7ad5742ccb67
+MISC ChangeLog 4146 RMD160 4a3dcf64319e002e55d39ed08be555175e1c3302 SHA1 063643af9d2fb5b35377b62a29a5bee7e7ac4fd6 SHA256 45e640d6ae2af796f589c66e0d7841c840c66be06fa7373b36721dbe12374cfe
MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574
diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
new file mode 100644
index 0000000..fa4774e
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+MY_EXTRAS_VER="20100201-0104Z"
+EAPI=2
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+#RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ emake check || die "make check failed"
+ if ! use "minimal" ; then
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # archive_gis really sucks a lot, but it's only relevant for the
+ # USE=extraengines case
+ case ${PV} in
+ 5.0.42)
+ mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+ ;;
+
+ 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+ [ "$(tc-endian)" == "big" ] && \
+ mysql_disable_test \
+ "archive_gis" \
+ "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+ ;;
+ esac
+
+ # This was a slight testcase breakage when the read_only security issue
+ # was fixed.
+ case ${PV} in
+ 5.0.54|5.0.51*)
+ mysql_disable_test \
+ "read_only" \
+ "Broken in 5.0.51-54, output in wrong order"
+ ;;
+ esac
+
+ # Ditto to read_only
+ [ "${PV}" == "5.0.51a" ] && \
+ mysql_disable_test \
+ "view" \
+ "Broken in 5.0.51, output in wrong order"
+
+ # x86-specific, OOM issue with some subselects on low memory servers
+ [ "${PV}" == "5.0.54" ] && \
+ [ "${ARCH/x86}" != "${ARCH}" ] && \
+ mysql_disable_test \
+ "subselect" \
+ "Testcase needs tuning on x86 for oom condition"
+
+ # Broke with the YaSSL security issue that didn't affect Gentoo.
+ [ "${PV}" == "5.0.56" ] && \
+ for t in openssl_1 rpl_openssl rpl_ssl ssl \
+ ssl_8k_key ssl_compress ssl_connect ; do \
+ mysql_disable_test \
+ "$t" \
+ "OpenSSL tests broken on 5.0.56"
+ done
+
+ # New test was broken in first time
+ # Upstream bug 41066
+ # http://bugs.mysql.com/bug.php?id=41066
+ [ "${PV}" == "5.0.72" ] && \
+ mysql_disable_test \
+ "status2" \
+ "Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.0.*|5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ make -j1 test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+ else
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
new file mode 100644
index 0000000..d668e4d
--- /dev/null
+++ b/eclass/mysql-autotools.eclass
@@ -0,0 +1,729 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+
+# @ECLASS: mysql.eclass
+# @MAINTAINER:
+# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
+# Maintainers:
+# - MySQL Team <mysql-bugs@gentoo.org>
+# - Robin H. Johnson <robbat2@gentoo.org>
+# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# - Luca Longinotti <chtekk@gentoo.org>
+# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql.eclass provides almost all the code to build the mysql ebuilds
+# including the src_unpack, src_prepare, src_configure, src_compile,
+# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+disable_test() {
+
+ local rawtestname testname testsuite reason mysql_disable_file
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+ testsuite="${rawtestname/.*}"
+ testname="${rawtestname/*.}"
+ mysql_disable_file="${S}/mysql-test/t/disabled.def"
+ #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+ echo ${testname} : ${reason} >> "${mysql_disable_file}"
+
+ # ${S}/mysql-tests/t/disabled.def
+ #
+ # ${S}/mysql-tests/suite/federated/disabled.def
+ #
+ # ${S}/mysql-tests/suite/jp/t/disabled.def
+ # ${S}/mysql-tests/suite/ndb/t/disabled.def
+ # ${S}/mysql-tests/suite/rpl/t/disabled.def
+ # ${S}/mysql-tests/suite/parts/t/disabled.def
+ # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
+ # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
+ # ${S}/mysql-tests/suite/binlog/t/disabled.def
+ # ${S}/mysql-tests/suite/innodb/t/disabled.def
+ if [ -n "${testsuite}" ]; then
+ for mysql_disable_file in \
+ ${S}/mysql-test/suite/${testsuite}/disabled.def \
+ ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
+ FAILED ; do
+ [ -f "${mysql_disable_file}" ] && break
+ done
+ if [ "${mysql_disabled_file}" != "FAILED" ]; then
+ echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+ else
+ ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+ fi
+ fi
+}
+
+configure_minimal() {
+
+ # These are things we exclude from a minimal build, please
+ # note that the server actually does get built and installed,
+ # but we then delete it before packaging.
+ local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
+
+ for i in ${minimal_exclude_list} ; do
+ myconf="${myconf} --without-${i}"
+ done
+ myconf="${myconf} --with-extra-charsets=none"
+ myconf="${myconf} --enable-local-infile"
+
+ if use static ; then
+ myconf="${myconf} --with-client-ldflags=-all-static"
+ myconf="${myconf} --disable-shared --with-pic"
+ else
+ myconf="${myconf} --enable-shared --enable-static"
+ fi
+
+ if mysql_version_is_at_least "4.1" && ! use latin1 ; then
+ myconf="${myconf} --with-charset=utf8"
+ myconf="${myconf} --with-collation=utf8_general_ci"
+ else
+ myconf="${myconf} --with-charset=latin1"
+ myconf="${myconf} --with-collation=latin1_swedish_ci"
+ fi
+}
+
+configure_common() {
+
+ myconf="${myconf} $(use_with big-tables)"
+ myconf="${myconf} --enable-local-infile"
+ myconf="${myconf} --with-extra-charsets=all"
+ myconf="${myconf} --with-mysqld-user=mysql"
+ myconf="${myconf} --with-server"
+ myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
+ myconf="${myconf} --without-libwrap"
+
+ if use static ; then
+ myconf="${myconf} --with-mysqld-ldflags=-all-static"
+ myconf="${myconf} --with-client-ldflags=-all-static"
+ myconf="${myconf} --disable-shared --with-pic"
+ else
+ myconf="${myconf} --enable-shared --enable-static"
+ fi
+
+ if use debug ; then
+ myconf="${myconf} --with-debug=full"
+ else
+ myconf="${myconf} --without-debug"
+ mysql_version_is_at_least "4.1.3" \
+ && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
+ && myconf="${myconf} --without-ndb-debug"
+ fi
+
+ if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+ myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
+ myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
+ elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
+ myconf="${myconf} --with-charset=utf8"
+ myconf="${myconf} --with-collation=utf8_general_ci"
+ else
+ myconf="${myconf} --with-charset=latin1"
+ myconf="${myconf} --with-collation=latin1_swedish_ci"
+ fi
+
+ if use embedded ; then
+ myconf="${myconf} --with-embedded-privilege-control"
+ myconf="${myconf} --with-embedded-server"
+ else
+ myconf="${myconf} --without-embedded-privilege-control"
+ myconf="${myconf} --without-embedded-server"
+ fi
+
+}
+
+configure_40_41_50() {
+
+ myconf="${myconf} $(use_with perl bench)"
+ myconf="${myconf} --enable-assembler"
+ myconf="${myconf} --with-extra-tools"
+ myconf="${myconf} --with-innodb"
+ myconf="${myconf} --without-readline"
+ myconf="${myconf} $(use_with ssl openssl)"
+ mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
+
+ # --with-vio is not needed anymore, it's on by default and
+ # has been removed from configure
+ # Apply to 4.x and 5.0.[0-3]
+ if use ssl ; then
+ mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
+ fi
+
+ if mysql_version_is_at_least "5.0.60" ; then
+ if use berkdb ; then
+ elog "Berkeley DB support was disabled due to build failures"
+ elog "on multiple arches, go to a version earlier than 5.0.60"
+ elog "if you want it again. Gentoo bug #224067."
+ fi
+ myconf="${myconf} --without-berkeley-db"
+ elif use berkdb ; then
+ # The following fix is due to a bug with bdb on SPARC's. See:
+ # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+ # It comes down to non-64-bit safety problems.
+ if use alpha || use amd64 || use hppa || use mips || use sparc ; then
+ elog "Berkeley DB support was disabled due to compatibility issues on this arch"
+ myconf="${myconf} --without-berkeley-db"
+ else
+ myconf="${myconf} --with-berkeley-db=./bdb"
+ fi
+ else
+ myconf="${myconf} --without-berkeley-db"
+ fi
+
+ if mysql_version_is_at_least "4.1.3" ; then
+ myconf="${myconf} --with-geometry"
+ if [[ "${PN}" != "mysql-cluster" ]] ; then
+ myconf="${myconf} $(use_with cluster ndbcluster)"
+ fi
+ fi
+
+ if mysql_version_is_at_least "4.1.3" && use extraengine ; then
+ # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
+ myconf="${myconf} --with-archive-storage-engine"
+
+ # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+ myconf="${myconf} --with-csv-storage-engine"
+
+ # http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
+ myconf="${myconf} --with-blackhole-storage-engine"
+
+ # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
+ # http://dev.mysql.com/doc/mysql/en/federated-description.html
+ # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
+ if mysql_version_is_at_least "5.0.3" ; then
+ elog "Before using the Federated storage engine, please be sure to read"
+ elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+ myconf="${myconf} --with-federated-storage-engine"
+ fi
+ fi
+
+ 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
+
+ mysql_version_is_at_least "5.0.18" \
+ && use max-idx-128 \
+ && myconf="${myconf} --with-max-indexes=128"
+}
+
+configure_51() {
+
+ # TODO: !!!! readd --without-readline
+ # the failure depend upon config/ac-macros/readline.m4 checking into
+ # readline.h instead of history.h
+ myconf="${myconf} $(use_with ssl ssl /usr)"
+ myconf="${myconf} --enable-assembler"
+ myconf="${myconf} --with-geometry"
+ myconf="${myconf} --with-readline"
+ myconf="${myconf} --with-zlib-dir=/usr/"
+ myconf="${myconf} --without-pstack"
+ myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
+
+ # This is an explict die here, because if we just forcibly disable it, then the
+ # 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="$(
+ LANG=C \
+ find "${S}" \
+ \( \
+ -name 'plug.in' \
+ -o -iname 'configure.in' \
+ -o -iname 'configure.ac' \
+ \) \
+ -print0 \
+ | xargs -0 sed -r -n \
+ -e '/^MYSQL_STORAGE_ENGINE/{
+ s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
+ s~^([^ ]+).*~\1~gp;
+ }' \
+ | tr -s '\n' ' '
+ )"
+
+ # 5.1 introduces a new way to manage storage engines (plugins)
+ # like configuration=none
+ # This base set are required, and will always be statically built.
+ local plugins_sta="csv myisam myisammrg heap"
+ local plugins_dyn=""
+ local plugins_dis="example ibmdb2i"
+
+ # These aren't actually required by the base set, but are really useful:
+ plugins_sta="${plugins_sta} archive blackhole"
+
+ # default in 5.5.4
+ if mysql_version_is_at_least "5.5.4" ; then
+ plugins_sta="${plugins_sta} partition"
+ fi
+ # Now the extras
+ if use extraengine ; then
+ # like configuration=max-no-ndb, archive and example removed in 5.1.11
+ # not added yet: ibmdb2i
+ # Not supporting as examples: example,daemon_example,ftexample
+ plugins_sta="${plugins_sta} partition"
+
+ 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"
+ 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"
+ fi
+ else
+ plugins_dis="${plugins_dis} partition federated"
+ fi
+
+ # Upstream specifically requests that InnoDB always be built:
+ # - innobase, innodb_plugin
+ # Build falcon if available for 6.x series.
+ for i in innobase falcon ; do
+ [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+ done
+ for i in innodb_plugin ; do
+ [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
+ done
+
+ # like configuration=max-no-ndb
+ if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
+ plugins_sta="${plugins_sta} ndbcluster partition"
+ plugins_dis="${plugins_dis//partition}"
+ myconf="${myconf} --with-ndb-binlog"
+ else
+ plugins_dis="${plugins_dis} ndbcluster"
+ fi
+
+ if [[ "${PN}" == "mariadb" ]] ; then
+ # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
+ # caught above.
+ # This is not optional, without it several upstream testcases fail.
+ # Also strongly recommended by upstream.
+ if [[ "${PV}" < "5.2.0" ]] ; then
+ myconf="${myconf} --with-maria-tmp-tables"
+ plugins_sta="${plugins_sta} maria"
+ else
+ myconf="${myconf} --with-aria-tmp-tables"
+ plugins_sta="${plugins_sta} aria"
+ fi
+
+ [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
+ die "The ${P} package doesn't provide innobase nor xtradb"
+
+ for i in innobase xtradb ; do
+ [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+ done
+
+ myconf="${myconf} $(use_with libevent)"
+
+ if mysql_version_is_at_least "5.2" ; then
+ for i in oqgraph ; do
+ use ${i} \
+ && plugins_dyn="${plugins_dyn} ${i}" \
+ || plugins_dis="${plugins_dis} ${i}"
+ done
+ fi
+
+ if mysql_version_is_at_least "5.2.5" ; then
+ for i in sphinx ; do
+ use ${i} \
+ && plugins_dyn="${plugins_dyn} ${i}" \
+ || plugins_dis="${plugins_dis} ${i}"
+ done
+ fi
+ fi
+
+ if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
+ use pbxt \
+ && plugins_dyn="${plugins_dyn} pbxt" \
+ || plugins_dis="${plugins_dis} pbxt"
+ fi
+
+ use static && \
+ plugins_sta="${plugins_sta} ${plugins_dyn}" && \
+ plugins_dyn=""
+
+ einfo "Available plugins: ${plugins_avail}"
+ einfo "Dynamic plugins: ${plugins_dyn}"
+ einfo "Static plugins: ${plugins_sta}"
+ einfo "Disabled plugins: ${plugins_dis}"
+
+ # These are the static plugins
+ myconf="${myconf} --with-plugins=${plugins_sta// /,}"
+ # And the disabled ones
+ for i in ${plugins_dis} ; do
+ myconf="${myconf} --without-plugin-${i}"
+ done
+}
+
+pbxt_src_configure() {
+
+ mysql_init_vars
+
+ pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
+
+ einfo "Reconfiguring dir '${PWD}'"
+ eautoreconf
+
+ local myconf=""
+ myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
+ use debug && myconf="${myconf} --with-debug=full"
+ econf ${myconf} || die "Problem configuring PBXT storage engine"
+}
+
+pbxt_src_compile() {
+
+ # TODO: is it safe/needed to use emake here ?
+ make || die "Problem making PBXT storage engine (${myconf})"
+
+ popd
+ # TODO: modify test suite for PBXT
+}
+
+pbxt_src_install() {
+
+ pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
+ emake install DESTDIR="${D}" || die "Failed to install PBXT"
+ popd
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-autotools_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+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
+
+ # 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 (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
+ find . -name 'Makefile.am' \
+ -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+
+ if mysql_version_is_at_least "4.1" ; then
+ # Remove what needs to be recreated, so we're sure it's actually done
+ einfo "Cleaning up old buildscript files"
+ find . -name Makefile \
+ -o -name Makefile.in \
+ -o -name configure \
+ -exec rm -f {} \;
+ rm -f "ltmain.sh"
+ rm -f "scripts/mysqlbug"
+ fi
+
+ local rebuilddirlist d
+
+ if xtradb_patch_available && use xtradb ; then
+ einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
+ pushd "${S}"/storage >/dev/null
+ i="innobase"
+ o="${WORKDIR}/storage-${i}.mysql-upstream"
+ # Have we been here already?
+ [ -d "${o}" ] && rm -f "${i}"
+ # Or maybe we haven't
+ [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
+ cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
+ popd >/dev/null
+ fi
+
+ if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+ einfo "Adding storage engine: PBXT"
+ pushd "${S}"/storage >/dev/null
+ i='pbxt'
+ [ -d "${i}" ] && rm -rf "${i}"
+ cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
+ popd >/dev/null
+ fi
+
+ if mysql_version_is_at_least "5.1.12" ; then
+ rebuilddirlist="."
+ # This does not seem to be needed presently. robbat2 2010/02/23
+ #einfo "Updating innobase cmake"
+ ## 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
+
+ for d in ${rebuilddirlist} ; do
+ einfo "Reconfiguring dir '${d}'"
+ pushd "${d}" &>/dev/null
+ eautoreconf
+ popd &>/dev/null
+ done
+
+ if mysql_check_version_range "4.1 to 5.0.99.99" \
+ && use berkdb ; then
+ einfo "Fixing up berkdb buildsystem"
+ [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
+ cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
+ || die "Could not copy libtool.m4 to bdb/dist/"
+ #These files exist only with libtool-2*, and need to be included.
+ if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
+ cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
+ cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
+ cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
+ cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
+ fi
+ pushd "bdb/dist" &>/dev/null
+ sh s_all \
+ || die "Failed bdb reconfigure"
+ popd &>/dev/null
+ fi
+}
+
+# @FUNCTION: mysql-autotools_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-autotools_src_configure() {
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # $myconf is modified by the configure_* functions
+ local myconf=""
+
+ if use minimal ; then
+ configure_minimal
+ else
+ configure_common
+ if mysql_version_is_at_least "5.1.10" ; then
+ configure_51
+ else
+ configure_40_41_50
+ fi
+ fi
+
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ # glib-2.3.2_pre fix, bug #16496
+ append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+ # As discovered by bug #246652, doing a double-level of SSP causes NDB to
+ # fail badly during cluster startup.
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ filter-flags "-fstack-protector-all"
+ fi
+
+ CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
+ CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+ mysql_version_is_at_least "5.0" \
+ && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+ export CXXFLAGS
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
+ # causes a mis-compile.
+ # Upstream bugs:
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
+ # http://bugs.mysql.com/bug.php?id=45205
+ use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
+ append-flags -fno-omit-frame-pointer && \
+ filter-flags -fomit-frame-pointer
+
+ econf \
+ --libexecdir="/usr/sbin" \
+ --sysconfdir="${MY_SYSCONFDIR}" \
+ --localstatedir="${MY_LOCALSTATEDIR}" \
+ --sharedstatedir="${MY_SHAREDSTATEDIR}" \
+ --libdir="${MY_LIBDIR}" \
+ --includedir="${MY_INCLUDEDIR}" \
+ --with-low-memory \
+ --with-client-ldflags=-lstdc++ \
+ --enable-thread-safe-client \
+ --with-comment="Gentoo Linux ${PF}" \
+ --without-docs \
+ ${myconf} || die "econf failed"
+
+ # TODO: Move this before autoreconf !!!
+ find . -type f -name Makefile -print0 \
+ | xargs -0 -n100 sed -i \
+ -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
+
+ if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+ pbxt_patch_available && use pbxt && pbxt_src_configure
+ fi
+}
+
+# @FUNCTION: mysql-autotools_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-autotools_src_compile() {
+
+ emake || die "emake failed"
+
+ if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+ pbxt_patch_available && use pbxt && pbxt_src_compile
+ fi
+}
+
+# @FUNCTION: mysql-autotools_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-autotools_src_install() {
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ emake install \
+ DESTDIR="${D}" \
+ benchdir_root="${MY_SHAREDSTATEDIR}" \
+ testroot="${MY_SHAREDSTATEDIR}" \
+ || die "emake install failed"
+
+ if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+ pbxt_patch_available && use pbxt && pbxt_src_install
+ fi
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # Various junk (my-*.cnf moved elsewhere)
+ einfo "Removing duplicate /usr/share/mysql files"
+ rm -Rf "${D}/usr/share/info"
+ for removeme in "mysql-log-rotate" mysql.server* \
+ binary-configure* my-*.cnf mi_test_all*
+ do
+ rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
+ done
+
+ # Clean up stuff for a minimal build
+ if use minimal ; then
+ einfo "Remove all extra content for minimal build"
+ rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+ rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+ rm -f "${D}/usr/sbin/mysqld"
+ rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if use !test ; then
+ rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+ fi
+
+ # Configuration stuff
+ case ${MYSQL_PV_MAJOR} in
+ 3*|4.0) mysql_mycnf_version="4.0" ;;
+ 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
+ 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
+ esac
+ einfo "Building default my.cnf (${mysql_mycnf_version})"
+ insinto "${MY_SYSCONFDIR}"
+ doins scripts/mysqlaccess.conf
+ mycnf_src="my.cnf-${mysql_mycnf_version}"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok"
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok"
+ fi
+ newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+ # Minimal builds don't have the MySQL server
+ if ! use minimal ; then
+ einfo "Creating initial directories"
+ # Empty directories ...
+ diropts "-m0750"
+ if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+ dodir "${MY_DATADIR}"
+ keepdir "${MY_DATADIR}"
+ chown -R mysql:mysql "${D}/${MY_DATADIR}"
+ fi
+
+ diropts "-m0755"
+ for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+ dodir "${folder}"
+ keepdir "${folder}"
+ chown -R mysql:mysql "${D}/${folder}"
+ done
+ fi
+
+ # Docs
+ einfo "Installing docs"
+ dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+ doinfo "${S}"/Docs/mysql.info
+
+ # Minimal builds don't have the MySQL server
+ if ! use minimal ; then
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ for script in \
+ "${S}"/support-files/my-*.cnf \
+ "${S}"/support-files/magic \
+ "${S}"/support-files/ndb-config-2-node.ini
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+ done
+
+ fi
+
+ mysql_lib_symlinks "${D}"
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
new file mode 100644
index 0000000..862401f
--- /dev/null
+++ b/eclass/mysql-cmake.eclass
@@ -0,0 +1,431 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+
+# @ECLASS: mysql.cmake.eclass
+# @MAINTAINER:
+# Maintainers:
+# - MySQL Team <mysql-bugs@gentoo.org>
+# - Robin H. Johnson <robbat2@gentoo.org>
+# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides the cmake supporting functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql-cmake.eclass provides provides the cmake specific code
+# for mysql ebuilds.
+
+inherit cmake-utils
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_cmake_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql_cmake_disable_test() {
+
+ local rawtestname testname testsuite reason mysql_disable_file
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+ testsuite="${rawtestname/.*}"
+ testname="${rawtestname/*.}"
+ mysql_disable_file="${S}/mysql-test/t/disabled.def"
+ #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+ echo ${testname} : ${reason} >> "${mysql_disable_file}"
+
+ # ${S}/mysql-tests/t/disabled.def
+ #
+ # ${S}/mysql-tests/suite/federated/disabled.def
+ #
+ # ${S}/mysql-tests/suite/jp/t/disabled.def
+ # ${S}/mysql-tests/suite/ndb/t/disabled.def
+ # ${S}/mysql-tests/suite/rpl/t/disabled.def
+ # ${S}/mysql-tests/suite/parts/t/disabled.def
+ # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
+ # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
+ # ${S}/mysql-tests/suite/binlog/t/disabled.def
+ # ${S}/mysql-tests/suite/innodb/t/disabled.def
+ if [ -n "${testsuite}" ]; then
+ for mysql_disable_file in \
+ ${S}/mysql-test/suite/${testsuite}/disabled.def \
+ ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
+ FAILED ; do
+ [ -f "${mysql_disable_file}" ] && break
+ done
+ if [ "${mysql_disabled_file}" != "FAILED" ]; then
+ echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+ else
+ ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+ fi
+ fi
+}
+
+# @FUNCTION: configure_cmake_locale
+# @DESCRIPTION:
+# Helper function to configure locale cmake options
+configure_cmake_locale() {
+
+ if ! use minimal && [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+}
+
+# @FUNCTION: configure_cmake_minimal
+# @DESCRIPTION:
+# Helper function to configure minimal install
+configure_cmake_minimal() {
+
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITHOUT_EMBEDDED_SERVER=1
+ -DENABLED_LOCAL_INFILE=1
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SSL=system
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DWITHOUT_READLINE=1
+ -DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
+ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
+ )
+}
+
+# @FUNCTION: configure_cmake_standard
+# @DESCRIPTION:
+# Helper function to configure standard install
+configure_cmake_standard() {
+
+ mycmakeargs+=(
+ -DENABLED_LOCAL_INFILE=1
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock
+ -DWITHOUT_READLINE=1
+ -DWITH_SSL=system
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ )
+
+ if use static ; then
+ mycmakeargs+=( -DDISABLE_SHARED=1 )
+ else
+ mycmakeargs+=( -DDISABLED_SHARED=0 )
+ fi
+
+ mycmakeargs+=(
+ $(cmake-utils_use_with debug)
+ $(cmake-utils_use_with embedded EMBEDDED_SERVER)
+ $(cmake-utils_use_with profiling)
+ )
+
+}
+
+configure_51() {
+
+ myconf="${myconf} $(use_with ssl ssl /usr)"
+
+ # This is an explict die here, because if we just forcibly disable it, then the
+ # 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"
+
+ # Scan for all available plugins
+ local plugins_avail="$(
+ LANG=C \
+ find "${S}" \
+ \( \
+ -name 'plug.in' \
+ -o -iname 'configure.in' \
+ -o -iname 'configure.ac' \
+ \) \
+ -print0 \
+ | xargs -0 sed -r -n \
+ -e '/^MYSQL_STORAGE_ENGINE/{
+ s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
+ s~^([^ ]+).*~\1~gp;
+ }' \
+ | tr -s '\n' ' '
+ )"
+
+ # 5.1 introduces a new way to manage storage engines (plugins)
+ # like configuration=none
+ # This base set are required, and will always be statically built.
+ local plugins_sta="csv myisam myisammrg heap"
+ local plugins_dyn=""
+ local plugins_dis="example ibmdb2i"
+
+ # These aren't actually required by the base set, but are really useful:
+ plugins_sta="${plugins_sta} archive blackhole"
+
+ # default in 5.5.4
+ if mysql_version_is_at_least "5.5.4" ; then
+ plugins_sta="${plugins_sta} partition"
+ fi
+ # Now the extras
+ if use extraengine ; then
+ # like configuration=max-no-ndb, archive and example removed in 5.1.11
+ # not added yet: ibmdb2i
+ # Not supporting as examples: example,daemon_example,ftexample
+ plugins_sta="${plugins_sta} partition"
+
+ 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"
+ 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"
+ fi
+ else
+ plugins_dis="${plugins_dis} partition federated"
+ fi
+
+ # Upstream specifically requests that InnoDB always be built:
+ # - innobase, innodb_plugin
+ # Build falcon if available for 6.x series.
+ for i in innobase falcon ; do
+ [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+ done
+ for i in innodb_plugin ; do
+ [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
+ done
+
+ # like configuration=max-no-ndb
+ if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
+ plugins_sta="${plugins_sta} ndbcluster partition"
+ plugins_dis="${plugins_dis//partition}"
+ myconf="${myconf} --with-ndb-binlog"
+ else
+ plugins_dis="${plugins_dis} ndbcluster"
+ fi
+
+ use static && \
+ plugins_sta="${plugins_sta} ${plugins_dyn}" && \
+ plugins_dyn=""
+
+ einfo "Available plugins: ${plugins_avail}"
+ einfo "Dynamic plugins: ${plugins_dyn}"
+ einfo "Static plugins: ${plugins_sta}"
+ einfo "Disabled plugins: ${plugins_dis}"
+
+ # These are the static plugins
+ myconf="${myconf} --with-plugins=${plugins_sta// /,}"
+ # And the disabled ones
+ for i in ${plugins_dis} ; do
+ myconf="${myconf} --without-plugin-${i}"
+ done
+}
+
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-cmake_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-cmake_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
+
+ # 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}"
+
+ rm -f "scripts/mysqlbug"
+}
+
+# @FUNCTION: mysql-cmake_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-cmake_src_configure() {
+
+ mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DMYSQL_DATADIR=/var/lib/mysql
+ -DSYSCONFDIR=/etc/mysql
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${P}
+ -DINSTALL_DOCREADMEDIR=share/doc/${P}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)/mysql
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLDATADIR=/var/lib/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql
+ -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SCRIPTDIR=share/mysql/scripts
+ -DINSTALL_SQLBENCHDIR=share/mysql
+ -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ )
+
+ configure_cmake_locale
+
+ if use minimal ; then
+ configure_cmake_minimal
+ else
+ configure_cmake_standard
+ fi
+
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
+ CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+ CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+ export CXXFLAGS
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ cmake-utils_src_configure
+}
+
+# @FUNCTION: mysql-cmake_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-cmake_src_compile() {
+
+ cmake-utils_src_compile
+}
+
+# @FUNCTION: mysql-cmake_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-cmake_src_install() {
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ cmake-utils_src_install
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ rm -Rf "${D}/usr/data"
+
+ # Various junk (my-*.cnf moved elsewhere)
+ einfo "Removing duplicate /usr/share/mysql files"
+# rm -Rf "${D}/usr/share/info"
+# for removeme in "mysql-log-rotate" mysql.server* \
+# binary-configure* my-*.cnf mi_test_all*
+# do
+# rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
+# done
+
+ # Clean up stuff for a minimal build
+# if use minimal ; then
+# einfo "Remove all extra content for minimal build"
+# rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+# rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+# rm -f "${D}/usr/sbin/mysqld"
+# rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+# fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+ fi
+
+ # Configuration stuff
+ case ${MYSQL_PV_MAJOR} in
+ 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
+ esac
+ einfo "Building default my.cnf (${mysql_mycnf_version})"
+ insinto "${MY_SYSCONFDIR}"
+ doins scripts/mysqlaccess.conf
+ mycnf_src="my.cnf-${mysql_mycnf_version}"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok"
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok"
+ fi
+ newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+ # Minimal builds don't have the MySQL server
+# if ! use minimal ; then
+# einfo "Creating initial directories"
+ # Empty directories ...
+# diropts "-m0750"
+# if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+# dodir "${MY_DATADIR}"
+# keepdir "${MY_DATADIR}"
+# chown -R mysql:mysql "${D}/${MY_DATADIR}"
+# fi
+#
+# diropts "-m0755"
+# for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+# dodir "${folder}"
+# keepdir "${folder}"
+# chown -R mysql:mysql "${D}/${folder}"
+# done
+# fi
+
+ # Docs
+# einfo "Installing docs"
+# dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+# doinfo "${S}"/Docs/mysql.info
+
+ # Minimal builds don't have the MySQL server
+# if ! use minimal ; then
+# einfo "Including support files and sample configurations"
+# docinto "support-files"
+# for script in \
+# "${S}"/support-files/my-*.cnf \
+# "${S}"/support-files/magic \
+# "${S}"/support-files/ndb-config-2-node.ini
+# do
+# [[ -f "$script" ]] && dodoc "${script}"
+# done
+#
+# docinto "scripts"
+# for script in "${S}"/scripts/mysql* ; do
+# [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+# done
+#
+# fi
+}
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
new file mode 100644
index 0000000..0d8bc91
--- /dev/null
+++ b/eclass/mysql-v2.eclass
@@ -0,0 +1,761 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+
+# @ECLASS: mysql.eclass
+# @MAINTAINER:
+# Maintainers:
+# - MySQL Team <mysql-bugs@gentoo.org>
+# - Robin H. Johnson <robbat2@gentoo.org>
+# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql.eclass provides almost all the code to build the mysql ebuilds
+# including the src_unpack, src_prepare, src_configure, src_compile,
+# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
+
+if [[ "${PN}" == "mysql" ]]; then
+ BUILD="cmake"
+ BUILD_INHERIT="mysql-cmake"
+else
+ BUILD="autotools"
+ BUILD_INHERIT="mysql-autotools"
+
+ WANT_AUTOCONF="latest"
+ WANT_AUTOMAKE="latest"
+fi
+
+inherit eutils flag-o-matic gnuconfig ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
+
+#
+# Supported EAPI versions and export functions
+#
+
+MYSQL_EXPF="src_unpack src_compile src_install"
+case "${EAPI:-0}" in
+ 2|3|4) MYSQL_EXPF+=" src_prepare src_configure" ;;
+ *) die "Unsupported EAPI: ${EAPI}" ;;
+esac
+
+EXPORT_FUNCTIONS ${MYSQL_EXPF}
+
+#
+# VARIABLES:
+#
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# 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_PV_MAJOR
+# @DESCRIPTION:
+# Upstream MySQL considers the first two parts of the version number to be the
+# major version. Upgrades that change major version should always run
+# 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:
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
+# This is an important part, because many of the choices the MySQL ebuild will do
+# depend on this variable.
+# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
+# We also strip off upstream's trailing letter that they use to respin tarballs
+
+MYSQL_VERSION_ID=""
+tpv="${PV%[a-z]}"
+tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3 ; do
+ # pad to length 2
+ tpv[${vatom}]="00${tpv[${vatom}]}"
+ MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number by BASH)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+
+# @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.0" ] && mysql_version_is_at_least "5.0.82"; then
+ MYSQL_COMMUNITY_FEATURES=1
+elif [ "${MYSQL_PV_MAJOR}" == "5.1" ] && mysql_version_is_at_least "5.1.28"; 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
+# @DESCRIPTION:
+# Version of the XTRADB storage engine
+XTRADB_VER="${XTRADB_VER}"
+
+
+# @ECLASS-VARIABLE: PERCONA_VER
+# @DESCRIPTION:
+# Designation by PERCONA for a MySQL version to apply an XTRADB release
+PERCONA_VER="${PERCONA_VER}"
+
+
+# Work out the default SERVER_URI correctly
+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_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.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+ http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+ http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
+ 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
+
+# Define correct SRC_URIs
+SRC_URI="${SERVER_URI}"
+
+# Gentoo patches to MySQL
+[[ ${MY_EXTRAS_VER} != live ]] \
+&& SRC_URI="${SRC_URI}
+ mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
+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."
+fi
+if [[ "${PN}" == "mysql-community" ]]; then
+ DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+case "${BUILD}" in
+ "autotools")
+ IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+ ;;
+ "cmake")
+ IUSE="debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+ ;;
+esac
+
+mysql_version_is_at_least "4.1" \
+&& IUSE="${IUSE} latin1"
+
+if mysql_version_is_at_least "4.1.3" ; then
+ IUSE="${IUSE} extraengine"
+ if [[ "${PN}" != "mysql-cluster" ]] ; then
+ IUSE="${IUSE} cluster"
+ fi
+fi
+
+mysql_version_is_at_least "5.0" \
+|| IUSE="${IUSE} raid"
+
+mysql_version_is_at_least "5.0.18" \
+&& IUSE="${IUSE} max-idx-128"
+
+mysql_version_is_at_least "5.1" \
+|| IUSE="${IUSE} berkdb"
+
+[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
+&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
+
+[[ "${PN}" == "mariadb" ]] \
+&& IUSE="${IUSE} libevent"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& IUSE="${IUSE} oqgraph"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2.5" \
+&& IUSE="${IUSE} sphinx"
+
+
+#
+# DEPENDENCIES:
+#
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
+ userland_GNU? ( sys-process/procps )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ >=sys-libs/readline-4.1
+ >=sys-libs/zlib-1.2.3"
+
+[[ "${PN}" == "mariadb" ]] \
+&& 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
+ [[ "${i}" == ${PN} ]] ||
+ DEPEND="${DEPEND} !dev-db/${i}"
+done
+
+RDEPEND="${DEPEND}
+ !minimal? ( dev-db/mysql-init-scripts )
+ selinux? ( sec-policy/selinux-mysql )
+"
+
+# compile-time-only
+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"
+
+# compile-time-only
+mysql_version_is_at_least "5.5.8" \
+&& DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2.5" \
+&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
+
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+# For other stuff to bring us in
+PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
+
+
+#
+# External patches
+#
+
+# MariaDB has integrated PBXT
+# PBXT_VERSION means that we have a PBXT patch for this PV
+# PBXT was only introduced after 5.1.12
+pbxt_patch_available() {
+ [[ "${PN}" != "mariadb" ]] \
+ && mysql_version_is_at_least "5.1.12" \
+ && [[ -n "${PBXT_VERSION}" ]]
+ return $?
+}
+
+pbxt_available() {
+ pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
+ return $?
+}
+
+# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
+# MariaDB has integrated XtraDB
+# XTRADB_VERS means that we have a XTRADB patch for this PV
+# XTRADB was only introduced after 5.1.26
+xtradb_patch_available() {
+ [[ "${PN}" != "mariadb" ]] \
+ && mysql_version_is_at_least "5.1.26" \
+ && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
+ return $?
+}
+
+
+pbxt_patch_available \
+&& PBXT_P="pbxt-${PBXT_VERSION}" \
+&& 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} )" \
+
+# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+# vs. built outside the dir
+pbxt_available \
+&& IUSE="${IUSE} pbxt" \
+&& mysql_version_is_at_least "5.1.40" \
+&& PBXT_NEWSTYLE=1
+
+xtradb_patch_available \
+&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
+&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
+&& XTRADB_SRC_B1="http://www.percona.com/" \
+&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
+&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
+&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& 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"
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql_disable_test() {
+
+ ${BUILD_INHERIT}_disable_test
+}
+
+configure_minimal() {
+
+ ${BUILD_INHERIT}_configure_minimal
+}
+
+configure_common() {
+
+ ${BUILD_INHERIT}_configure_common
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-v2_pkg_setup
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_setup phase:
+# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
+# check for conflicting use flags
+# create new user and group for mysql
+# warn about deprecated features
+mysql-v2_pkg_setup() {
+
+ if hasq test ${FEATURES} ; then
+ if ! use minimal ; then
+ if [[ $UID -eq 0 ]]; then
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ fi
+ 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.1.51" \
+ && ! 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 ! mysql_version_is_at_least "5.0" \
+ && use raid \
+ && use static ; then
+ eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
+ eerror "with RAID support enabled."
+ die "USE flags 'raid' and 'static' conflict!"
+ fi
+
+ if mysql_version_is_at_least "4.1.3" \
+ && ( 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 mysql_version_is_at_least "5.1" \
+ && xtradb_patch_available \
+ && use xtradb \
+ && use embedded ; then
+ M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
+ eerror "${M}"
+ die "${M}"
+ fi
+
+ # Bug #290570, 284946, 307251
+ # Upstream changes made us need a fairly new GCC4.
+ # But only for 5.0.8[3-6]!
+ if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
+ GCC_VER=$(gcc-version)
+ case ${GCC_VER} in
+ 2*|3*|4.0|4.1|4.2)
+ eerror "Some releases of MySQL required a very new GCC, and then"
+ eerror "later release relaxed that requirement again. Either pick a"
+ eerror "MySQL >=5.0.87, or use a newer GCC."
+ die "Active GCC too old!" ;;
+ esac
+ 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"
+
+ mysql_check_version_range "4.0 to 5.0.99.99" \
+ && use berkdb \
+ && elog "Berkeley DB support is deprecated and will be removed in future versions!"
+
+ if [ "${PN}" != "mysql-cluster" ] && 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
+}
+
+# @FUNCTION: mysql-v2_src_unpack
+# @DESCRIPTION:
+# Unpack the source code and call mysql_src_prepare for EAPI < 2.
+mysql-v2_src_unpack() {
+
+ # Initialize the proper variables first
+ mysql_init_vars
+
+ unpack ${A}
+ # Grab the patches
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
+
+ mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+}
+
+# @FUNCTION: mysql-v2_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-v2_src_prepare() {
+
+ ${BUILD_INHERIT}_src_prepare
+}
+
+# @FUNCTION: mysql-v2_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-v2_src_configure() {
+
+ ${BUILD_INHERIT}_src_configure
+}
+
+# @FUNCTION: mysql-v2_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-v2_src_compile() {
+
+ ${BUILD_INHERIT}_src_compile
+}
+
+# @FUNCTION: mysql-v2_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-v2_src_install() {
+
+ ${BUILD_INHERIT}_src_install
+}
+
+# @FUNCTION: mysql-v2_pkg_preinst
+# @DESCRIPTION:
+# Create the user and groups for mysql - die if that fails.
+mysql-v2_pkg_preinst() {
+ enewgroup mysql 60 || die "problem adding 'mysql' group"
+ enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+# @FUNCTION: mysql-v2_pkg_postinst
+# @DESCRIPTION:
+# Run post-installation tasks:
+# create the dir for logfiles if non-existant
+# touch the logfiles and secure them
+# install scripts
+# issue required steps for optional features
+# issue deprecation warnings
+mysql-v2_pkg_postinst() {
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Check FEATURES="collision-protect" before removing this
+ [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+ # Secure the logfiles
+ touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+ chown root:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+ chmod 0640 "${ROOT}${MY_LOGDIR}"/mysql*
+
+ # Minimal builds don't have the MySQL server
+ if ! use minimal ; then
+ docinto "support-files"
+ for script in \
+ support-files/my-*.cnf \
+ support-files/magic \
+ support-files/ndb-config-2-node.ini
+ do
+ [[ -f "${script}" ]] \
+ && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in scripts/mysql* ; do
+ [[ -f "${script}" ]] \
+ && [[ "${script%.sh}" == "${script}" ]] \
+ && dodoc "${script}"
+ done
+
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ einfo
+
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ if pbxt_available && use pbxt ; then
+ # TODO: explain it better
+ elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
+ elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
+ elog "if, after that, you cannot start the MySQL server,"
+ elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
+ elog "use the MySQL upgrade script to restore the table"
+ elog "or execute the following SQL command:"
+ elog " CREATE TABLE IF NOT EXISTS plugin ("
+ elog " name char(64) binary DEFAULT '' NOT NULL,"
+ elog " dl char(128) DEFAULT '' NOT NULL,"
+ elog " PRIMARY KEY (name)"
+ elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
+ fi
+
+ mysql_check_version_range "4.0 to 5.0.99.99" \
+ && use berkdb \
+ && elog "Berkeley DB support is deprecated and will be removed in future versions!"
+}
+
+# @FUNCTION: mysql-v2_pkg_config
+# @DESCRIPTION:
+# Configure mysql environment.
+mysql-v2_pkg_config() {
+
+ local old_MY_DATADIR="${MY_DATADIR}"
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+
+ if built_with_use ${CATEGORY}/${PN} minimal ; then
+ die "Minimal builds do NOT include the MySQL server"
+ fi
+
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
+ local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
+
+ if [[ -d "${old_MY_DATADIR_s}" ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
+ local pwd1="a"
+ local pwd2="b"
+ local MYSQL_ROOT_PASSWORD=''
+ local maxtry=15
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
+ MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
+ fi
+
+ if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+ ewarn "You have already a MySQL database in place."
+ ewarn "(${ROOT}/${MY_DATADIR}/*)"
+ ewarn "Please rename or delete it if you wish to replace it."
+ die "MySQL database already exists!"
+ fi
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+ einfo "Please provide a password for the mysql 'root' user now,"
+ einfo "or in the MYSQL_ROOT_PASSWORD env var."
+ ewarn "Avoid [\"'\\_%] characters in the password"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x$pwd1" != "x$pwd2" ]] ; then
+ die "Passwords are not the same"
+ fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
+
+ local options=""
+ local sqltmp="$(emktemp)"
+
+ local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+ [[ -r "${help_tables}" ]] \
+ && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+ || touch "${TMPDIR}/fill_help_tables.sql"
+ help_tables="${TMPDIR}/fill_help_tables.sql"
+
+ pushd "${TMPDIR}" &>/dev/null
+ "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
+ popd &>/dev/null
+ [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+ || die "MySQL databases not installed"
+ chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+ chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+ # Figure out which options we need to disable to do the setup
+ helpfile="${TMPDIR}/mysqld-help"
+ ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start bdb \
+ federated innodb ssl log-bin relay-log slow-query-log external-locking \
+ ndbcluster \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+ # But some options changed names
+ egrep -sq external-locking "${helpfile}" && \
+ options="${options/skip-locking/skip-external-locking}"
+
+ if mysql_version_is_at_least "4.1.3" ; then
+ # Filling timezones, see
+ # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+ if [[ -r "${help_tables}" ]] ; then
+ cat "${help_tables}" >> "${sqltmp}"
+ fi
+ fi
+
+ einfo "Creating the mysql database and setting proper"
+ einfo "permissions on it ..."
+
+ local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+ local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+ local mysqld="${ROOT}/usr/sbin/mysqld \
+ ${options} \
+ --user=mysql \
+ --basedir=${ROOT}/usr \
+ --datadir=${ROOT}/${MY_DATADIR} \
+ --max_allowed_packet=8M \
+ --net_buffer_length=16K \
+ --default-storage-engine=MyISAM \
+ --socket=${socket} \
+ --pid-file=${pidfile}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
+ ${mysqld} &
+ rc=$?
+ while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+ "${ROOT}/usr/bin/mysql" \
+ --socket=${socket} \
+ -hlocalhost \
+ -e "${sql}"
+ eend $?
+
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+ "${ROOT}/usr/bin/mysql" \
+ --socket=${socket} \
+ -hlocalhost \
+ -uroot \
+ -p"${MYSQL_ROOT_PASSWORD}" \
+ mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
+
+ # Stop the server and cleanup
+ einfo "Stopping the server ..."
+ kill $(< "${pidfile}" )
+ rm -f "${sqltmp}"
+ wait %1
+ einfo "Done"
+}
+
+# @FUNCTION: mysql-v2_pkg_postrm
+# @DESCRIPTION:
+# Remove mysql symlinks.
+mysql-v2_pkg_postrm() {
+
+ : # mysql_lib_symlinks "${D}"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2011-03-17 3:55 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 8+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-17 3:55 UTC (permalink / raw
To: gentoo-commits
commit: 34ddcc6fd1543de69741ea56cbeb77091ee83ce8
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 03:53:52 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 03:53:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=34ddcc6f
More cleanup of the ebuilds and eclasses.
---
dev-db/mysql/mysql-5.5.10.ebuild | 1 -
eclass/mysql-autotools.eclass | 4 +-
eclass/mysql-cmake.eclass | 12 ++++---
eclass/mysql-v2.eclass | 57 ++++++-------------------------------
4 files changed, 19 insertions(+), 55 deletions(-)
diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index fa4774e..309b9f1 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -21,7 +21,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar
EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-#RDEPEND="!media-sound/amarok[embedded]"
# Please do not add a naive src_unpack to this ebuild
# If you want to add a single patch, copy the ebuild to an overlay
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index d668e4d..6d8bf95 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: $
# @ECLASS: mysql.eclass
# @MAINTAINER:
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 862401f..d2ef3cc 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: $
# @ECLASS: mysql.cmake.eclass
# @MAINTAINER:
@@ -122,7 +122,6 @@ configure_cmake_standard() {
-DMYSQL_USER=mysql
-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock
-DWITHOUT_READLINE=1
- -DWITH_SSL=system
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
)
@@ -139,12 +138,15 @@ configure_cmake_standard() {
$(cmake-utils_use_with profiling)
)
+ if use ssl; then
+ mycmakeargs+=( -DWITH_SSL=system )
+ else
+ mycmakeargs+=( -DWITH_SSL=0 )
+ fi
}
configure_51() {
- myconf="${myconf} $(use_with ssl ssl /usr)"
-
# This is an explict die here, because if we just forcibly disable it, then the
# user's data is not accessible.
use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0d8bc91..7de76f5 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -181,34 +181,27 @@ SLOT="0"
case "${BUILD}" in
"autotools")
- IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+ IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
;;
"cmake")
- IUSE="debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+ IUSE="debug embedded minimal +perl selinux ssl static test"
;;
esac
-mysql_version_is_at_least "4.1" \
-&& IUSE="${IUSE} latin1"
+IUSE="${IUSE} latin1"
-if mysql_version_is_at_least "4.1.3" ; then
- IUSE="${IUSE} extraengine"
- if [[ "${PN}" != "mysql-cluster" ]] ; then
- IUSE="${IUSE} cluster"
- fi
+IUSE="${IUSE} extraengine"
+if [[ "${PN}" != "mysql-cluster" ]] ; then
+ IUSE="${IUSE} cluster"
fi
-mysql_version_is_at_least "5.0" \
-|| IUSE="${IUSE} raid"
-
mysql_version_is_at_least "5.0.18" \
&& IUSE="${IUSE} max-idx-128"
-mysql_version_is_at_least "5.1" \
-|| IUSE="${IUSE} berkdb"
+IUSE="${IUSE} berkdb"
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
-&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
+&& IUSE="${IUSE} +community profiling"
[[ "${PN}" == "mariadb" ]] \
&& IUSE="${IUSE} libevent"
@@ -250,10 +243,6 @@ RDEPEND="${DEPEND}
"
# compile-time-only
-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"
@@ -387,14 +376,6 @@ mysql-v2_pkg_setup() {
die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
fi
- if ! mysql_version_is_at_least "5.0" \
- && use raid \
- && use static ; then
- eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
- eerror "with RAID support enabled."
- die "USE flags 'raid' and 'static' conflict!"
- fi
-
if mysql_version_is_at_least "4.1.3" \
&& ( use cluster || use extraengine || use embedded ) \
&& use minimal ; then
@@ -412,28 +393,10 @@ mysql-v2_pkg_setup() {
die "${M}"
fi
- # Bug #290570, 284946, 307251
- # Upstream changes made us need a fairly new GCC4.
- # But only for 5.0.8[3-6]!
- if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
- GCC_VER=$(gcc-version)
- case ${GCC_VER} in
- 2*|3*|4.0|4.1|4.2)
- eerror "Some releases of MySQL required a very new GCC, and then"
- eerror "later release relaxed that requirement again. Either pick a"
- eerror "MySQL >=5.0.87, or use a newer GCC."
- die "Active GCC too old!" ;;
- esac
- 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"
- mysql_check_version_range "4.0 to 5.0.99.99" \
- && use berkdb \
- && elog "Berkeley DB support is deprecated and will be removed in future versions!"
-
if [ "${PN}" != "mysql-cluster" ] && 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"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2011-03-17 4:43 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 8+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-17 4:43 UTC (permalink / raw
To: gentoo-commits
commit: 23d882d9665185c9708c033fafcf4c8a78ed95af
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 04:42:10 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 04:42:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=23d882d9
Really add the mysql_fx.eclass update.
Restore the create data dir block in src_install.
---
dev-db/mysql/Manifest | 2 +-
eclass/mysql-cmake.eclass | 32 ++++++++++----------
eclass/mysql_fx.eclass | 73 +++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 88 insertions(+), 19 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index bca7e10..be972aa 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -23,7 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
-EBUILD mysql-5.5.10.ebuild 6907 RMD160 3cd815a40143d33e9a939c8d0937d0da550a6f9e SHA1 8ae70da5b59b6ed898fe6a50924d1db08542902e SHA256 24d9f7a4de939177eee9f334c086ba2144c897cb508f93256b6ffee650456be9
+EBUILD mysql-5.5.10.ebuild 6866 RMD160 bfc0e6b14720be2cf70e6291c6e12600fac8dd3a SHA1 06d16abd5266064f67ad745c2263bf90b57715ec SHA256 0bf345406c9ada42dcbb94d94bac566e1b11d11d048dae34d08291687da570f7
EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
MISC ChangeLog 4146 RMD160 4a3dcf64319e002e55d39ed08be555175e1c3302 SHA1 063643af9d2fb5b35377b62a29a5bee7e7ac4fd6 SHA256 45e640d6ae2af796f589c66e0d7841c840c66be06fa7373b36721dbe12374cfe
MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d2ef3cc..7063e17 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -389,23 +389,23 @@ mysql-cmake_src_install() {
newins "${TMPDIR}/my.cnf.ok" my.cnf
# Minimal builds don't have the MySQL server
-# if ! use minimal ; then
-# einfo "Creating initial directories"
+ if ! use minimal ; then
+ einfo "Creating initial directories"
# Empty directories ...
-# diropts "-m0750"
-# if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-# dodir "${MY_DATADIR}"
-# keepdir "${MY_DATADIR}"
-# chown -R mysql:mysql "${D}/${MY_DATADIR}"
-# fi
-#
-# diropts "-m0755"
-# for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
-# dodir "${folder}"
-# keepdir "${folder}"
-# chown -R mysql:mysql "${D}/${folder}"
-# done
-# fi
+ diropts "-m0750"
+ if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+ dodir "${MY_DATADIR}"
+ keepdir "${MY_DATADIR}"
+ chown -R mysql:mysql "${D}/${MY_DATADIR}"
+ fi
+
+ diropts "-m0755"
+ for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+ dodir "${folder}"
+ keepdir "${folder}"
+ chown -R mysql:mysql "${D}/${folder}"
+ done
+ fi
# Docs
# einfo "Installing docs"
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index cb369be..25b7da4 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -3,8 +3,9 @@
# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.22 2009/02/12 05:05:14 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
-# Luca Longinotti <chtekk@gentoo.org>
+# Maintainer:
+# - MySQL Team <mysql-bugs@gentoo.org>
+# - Luca Longinotti <chtekk@gentoo.org>
inherit multilib
@@ -211,3 +212,71 @@ mysql_lib_symlinks() {
done
popd &> /dev/null
}
+
+# @FUNCTION: mysql_init_vars
+# @DESCRIPTION:
+# void mysql_init_vars()
+# Initialize global variables
+# 2005-11-19 <vivo@gentoo.org>
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
+ MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
+ MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
+ MY_SOURCEDIR=${SERVER_URI##*/}
+ MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2011-03-21 2:35 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 8+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-21 2:35 UTC (permalink / raw
To: gentoo-commits
commit: f260fec2767adf3b1bbc9cb4c9e5ff3a7cd2889d
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 02:35:05 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 02:35:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f260fec2
A few more updates for mysql-5.5.10 including a reworked patch from upstream ( http://lists.mysql.com/commits/102373 ) to build a shared libmysqld.
---
dev-db/mysql/ChangeLog | 5 +
dev-db/mysql/Manifest | 4 +-
dev-db/mysql/mysql-5.5.10.ebuild | 163 +++-----------------------------------
eclass/mysql-autotools.eclass | 2 +-
eclass/mysql-cmake.eclass | 11 +++-
5 files changed, 30 insertions(+), 155 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index efc8ea2..8cfdfc7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mysql-5.5.10.ebuild:
+ A few more updates for mysql-5.5.10 including a reworked patch from upstream
+ ( http://lists.mysql.com/commits/102373 ) to build a shared libmysqld.
+
*mysql-5.5.10 (17 Mar 2011)
17 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index be972aa..4cb9230 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -23,7 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
-EBUILD mysql-5.5.10.ebuild 6866 RMD160 bfc0e6b14720be2cf70e6291c6e12600fac8dd3a SHA1 06d16abd5266064f67ad745c2263bf90b57715ec SHA256 0bf345406c9ada42dcbb94d94bac566e1b11d11d048dae34d08291687da570f7
+EBUILD mysql-5.5.10.ebuild 1913 RMD160 716bb2197d8790d8dfbf996223a4c6abf3836639 SHA1 6d0f2879e5e5e18b3f66d153374cdc5a4c644b4f SHA256 db1260b85a0ec3dd9323adffac4b44397fda52a1e5e73c512f5c188b8338df35
EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 4146 RMD160 4a3dcf64319e002e55d39ed08be555175e1c3302 SHA1 063643af9d2fb5b35377b62a29a5bee7e7ac4fd6 SHA256 45e640d6ae2af796f589c66e0d7841c840c66be06fa7373b36721dbe12374cfe
+MISC ChangeLog 4389 RMD160 b57fd793c05239bdad046f044f8bb4ef2ec29924 SHA1 5207863d191de47f78c9b1d3f50388ea72693649 SHA256 065505f5d27103b349b53c62a580313d82ffb1409dd7c49b71da1352ceadef9d
MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574
diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index 309b9f1..1df83d3 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-MY_EXTRAS_VER="20100201-0104Z"
+MY_EXTRAS_VER="live"
EAPI=2
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
@@ -32,169 +32,30 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
# ebuild mysql-X.X.XX.ebuild \
# digest clean package
src_test() {
+
+ TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
- emake check || die "make check failed"
if ! use "minimal" ; then
+
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- make -j1 test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
- make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ # Run CTest
+ cmake-utils_src_test
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
+ # Run mysql tests
+ pushd "${TESTDIR}"
+ perl mysql-test-run.pl
+ popd
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
else
+
einfo "Skipping server tests due to minimal build."
fi
}
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 6d8bf95..f18e4eb 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -24,7 +24,7 @@
# @FUNCTION: mysql_disable_test
# @DESCRIPTION:
# Helper function to disable specific tests.
-disable_test() {
+mysql-autotools_disable_test() {
local rawtestname testname testsuite reason mysql_disable_file
rawtestname="${1}" ; shift
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7063e17..ea33cb0 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -22,7 +22,7 @@ inherit cmake-utils
# @FUNCTION: mysql_cmake_disable_test
# @DESCRIPTION:
# Helper function to disable specific tests.
-mysql_cmake_disable_test() {
+mysql-cmake_disable_test() {
local rawtestname testname testsuite reason mysql_disable_file
rawtestname="${1}" ; shift
@@ -250,6 +250,8 @@ configure_51() {
# Apply patches to the source code and remove unneeded bundled libs.
mysql-cmake_src_prepare() {
+ debug-print-function ${FUNCNAME} "$@"
+
cd "${S}"
# Apply the patches for this MySQL version
@@ -274,6 +276,8 @@ mysql-cmake_src_prepare() {
# Configure mysql to build the code for Gentoo respecting the use flags.
mysql-cmake_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
mycmakeargs=(
-DCMAKE_INSTALL_PREFIX=/usr
-DMYSQL_DATADIR=/var/lib/mysql
@@ -294,6 +298,7 @@ mysql-cmake_src_configure() {
-DINSTALL_SQLBENCHDIR=share/mysql
-DINSTALL_SUPPORTFILESDIR=/usr/share/mysql
-DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITHOUT_UNIT_TESTS=1
)
configure_cmake_locale
@@ -323,6 +328,8 @@ mysql-cmake_src_configure() {
# Compile the mysql code.
mysql-cmake_src_compile() {
+ debug-print-function ${FUNCNAME} "$@"
+
cmake-utils_src_compile
}
@@ -331,6 +338,8 @@ mysql-cmake_src_compile() {
# Install mysql.
mysql-cmake_src_install() {
+ debug-print-function ${FUNCNAME} "$@"
+
# Make sure the vars are correctly initialized
mysql_init_vars
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2011-03-26 20:42 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 8+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-26 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 4c02ed0e678a88bb66514856baf396e2ae4d33e6
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 20:42:31 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 20:42:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4c02ed0e
Applied a few more fixes to mysql-5.5.10.
---
dev-db/mysql/ChangeLog | 4 +++
dev-db/mysql/Manifest | 4 +-
dev-db/mysql/mysql-5.5.10.ebuild | 40 ++++++++++++++++++++++++++++++++++---
eclass/mysql-v2.eclass | 7 +++--
4 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 8cfdfc7..28307e7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mysql-5.5.10.ebuild:
+ Applied a few more fixes to mysql-5.5.10.
+
21 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mysql-5.5.10.ebuild:
A few more updates for mysql-5.5.10 including a reworked patch from upstream
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4cb9230..8faf5ed 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -23,7 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
-EBUILD mysql-5.5.10.ebuild 1913 RMD160 716bb2197d8790d8dfbf996223a4c6abf3836639 SHA1 6d0f2879e5e5e18b3f66d153374cdc5a4c644b4f SHA256 db1260b85a0ec3dd9323adffac4b44397fda52a1e5e73c512f5c188b8338df35
+EBUILD mysql-5.5.10.ebuild 3045 RMD160 df6d1c7398704646a057e2eabfbee81c8343e971 SHA1 ec73964a1f583282d60b3c5fdad8eee24e181eec SHA256 ee8e78b96df4296f27bb91fb19da1449b05ec2c86b41c76dcbee6ad844efcc39
EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 4389 RMD160 b57fd793c05239bdad046f044f8bb4ef2ec29924 SHA1 5207863d191de47f78c9b1d3f50388ea72693649 SHA256 065505f5d27103b349b53c62a580313d82ffb1409dd7c49b71da1352ceadef9d
+MISC ChangeLog 4524 RMD160 514499f220e7f1ecabda7d9428211e95c6a45d51 SHA1 70bc4d18cb7dfd095612d01603e64cac301701fe SHA256 5a0dd5c525e199bb7d141fe9b48e66a915bcfe7deba4d95b38fac8b303898ab0
MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574
diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index 1df83d3..4692147 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+EAPI="2"
+
MY_EXTRAS_VER="live"
-EAPI=2
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
@@ -33,7 +34,9 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
# digest clean package
src_test() {
- TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
@@ -46,14 +49,43 @@ src_test() {
fi
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
- # Run CTest
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
# Run mysql tests
pushd "${TESTDIR}"
- perl mysql-test-run.pl
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
popd
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
else
einfo "Skipping server tests due to minimal build."
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 7de76f5..03ddbd0 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -26,7 +26,10 @@ else
WANT_AUTOMAKE="latest"
fi
-inherit eutils flag-o-matic gnuconfig ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
+MYSQL_EXTRAS=""
+[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git"
+
+inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
#
# Supported EAPI versions and export functions
@@ -52,10 +55,8 @@ S="${WORKDIR}/mysql"
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_PV_MAJOR
# @DESCRIPTION:
# Upstream MySQL considers the first two parts of the version number to be the
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2013-03-01 2:47 Robin H. Johnson
0 siblings, 0 replies; 8+ messages in thread
From: Robin H. Johnson @ 2013-03-01 2:47 UTC (permalink / raw
To: gentoo-commits
commit: ef69414fc66c12f3a0cf95c978c851a850a3fe12
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Feb 27 17:38:59 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 17:38:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ef69414f
Bump to 5.6.10 and fix 5.6 linkage failures
---
dev-db/mysql/Manifest | 1 +
dev-db/mysql/mysql-5.6.10.ebuild | 119 ++++++++++++++++++++++++++++++++++++++
eclass/mysql-cmake.eclass | 6 ++-
3 files changed, 125 insertions(+), 1 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 87a0ac8..6671950 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,6 +2,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
+DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
diff --git a/dev-db/mysql/mysql-5.6.10.ebuild b/dev-db/mysql/mysql-5.6.10.ebuild
new file mode 100644
index 0000000..496dc33
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # These are failing in MySQL 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help-notwin
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ for t in main.mysql_client_test \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help-notwin; do
+ mysql_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index ffbcbd2..02326f2 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -221,6 +221,7 @@ mysql-cmake_src_prepare() {
[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
rm -f "scripts/mysqlbug"
+ epatch_user
}
# @FUNCTION: mysql-cmake_src_configure
@@ -275,7 +276,10 @@ mysql-cmake_src_configure() {
CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
- CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+ # Causes linkage failures. Upstream bug #59607 removes it
+ if ! mysql_version_is_at_least "5.6" ; then
+ CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+ fi
export CXXFLAGS
# bug #283926, with GCC4.4, this is required to get correct behavior.
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2014-01-23 4:18 Brian Evans
0 siblings, 0 replies; 8+ messages in thread
From: Brian Evans @ 2014-01-23 4:18 UTC (permalink / raw
To: gentoo-commits
commit: e2b77e3d6071bc5238af0729b6e81462d5304ad4
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Jan 23 04:18:04 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jan 23 04:18:04 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e2b77e3d
[mysql] Fix 5.7 libraries and patches
---
dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild | 6 +++---
eclass/mysql-cmake.eclass | 2 ++
eclass/mysql-v2.eclass | 8 +++++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
index 2977f9b..7f2d236 100644
--- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
+++ b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+# $Header: $
EAPI="4"
-MY_EXTRAS_VER="none"
+MY_EXTRAS_VER="live"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 81f465e..91c8e32 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -125,6 +125,7 @@ configure_cmake_minimal() {
-DWITHOUT_LIBWRAP=1
-DWITH_READLINE=0
-DWITH_LIBEDIT=0
+ -DWITH_EDITLINE=system
-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
-DWITHOUT_CSV_STORAGE_ENGINE=1
@@ -152,6 +153,7 @@ configure_cmake_standard() {
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
+ -DWITH_EDITLINE=system
)
mycmakeargs+=(
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 824158f..f11d660 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -251,11 +251,17 @@ DEPEND="
kernel_linux? ( sys-process/procps )
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
- >=sys-libs/readline-4.1
>=sys-libs/zlib-1.2.3
!dev-db/mariadb-native-client[mysqlcompat]
"
+# dev-db/mysql-5.7.3+ only works with dev-libs/libedit
+if [[ ${PN} == "mysql" ]] && mysql_version_is_at_least "5.7.3" ; then
+ DEPEND="${DEPEND} dev-libs/libedit"
+else
+ DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+fi
+
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/
@ 2014-10-03 13:30 Brian Evans
0 siblings, 0 replies; 8+ messages in thread
From: Brian Evans @ 2014-10-03 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 8111fc815735da6b9e23bc9e49a7246d0a14e66f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 1 13:06:23 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 1 13:06:23 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8111fc81
Add MySQL 5.7.5m15
---
dev-db/mysql/Manifest | 2 +-
dev-db/mysql/mysql-5.7.5_alpha_pre15.ebuild | 126 ++++++++++++++++++++++++++++
eclass/mysql-cmake.eclass | 2 +-
eclass/mysql-multilib.eclass | 6 +-
4 files changed, 131 insertions(+), 5 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 9bc9cc4..dec8675 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,9 +4,9 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
-DIST mysql-5.6.20.tar.gz 32979820 SHA256 4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d SHA512 c4bcc2a209616a38c04a4679cc7a76b354f0d7d3dda860b82b9cdb4746f897aa5c8204a440e1c65f55d81b2ac526b205dd0ba28786ba21778cc068efd71403ac WHIRLPOOL 09cd264b098401cdde9e57fd1dcf90387cb6e5f24b874c220914c6afcc4f03bccec9cb4e83a9694e740ac0ea4e5cf37297fab60fdf4d6342df71b7e4f75590f8
DIST mysql-5.6.21.tar.gz 33009070 SHA256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c SHA512 0a15c30d17324eb123d7953a2564fea43a3d288dfe098dc419096c40101f8ee2fe201dab1a4860158b72a259040cab7a45073576a1a24879b1e1dc9990c190bd WHIRLPOOL 8a00b0fe04df901aece356f979e29b47c4361fa5e14ec76c36e0bc43da4049de265b547f9a27b6c948d5989c04a784c6dca547e86cc380bbb57d477b614f8e31
DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
+DIST mysql-5.7.5-m15.tar.gz 46527024 SHA256 8f45d0a66952101a2c8490e833024f758aa4c6dce9ebc125ab8b472a72edc781 SHA512 301398a73d0c30afb2fe5628bde0e01d83daaacc2a0bedd323a4860680ae412f36fdd6a7146a78aeb0b0fa1d4394f5c5557ea2c891833c18179fb2490a35c339 WHIRLPOOL 32e181732b7c7a37fd830b9df92736e669decab681f6e9dbf0c6894d9b925dd09538cba4ddf3754e9e3c10baf0840aca9bf57332cdf15751555edbaff573027d
DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
diff --git a/dev-db/mysql/mysql-5.7.5_alpha_pre15.ebuild b/dev-db/mysql/mysql-5.7.5_alpha_pre15.ebuild
new file mode 100644
index 0000000..a4f6717
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.5_alpha_pre15.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_EXTRAS_VER="20140424-1043Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE='20008_all_mysql-tzinfo-symlink.patch'
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+ # These are failing in MySQL 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help-notwin, funcs_1.is_columns_mysql,
+ # funcs_1.is_tables_mysql, funcs_1.is_triggers,
+ # binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
+ # perfschema.binlog_edge_stmt
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.mysql_tzinfo_to_sql_symlink
+ # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+
+ for t in main.mysql_client_test \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help-notwin funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers \
+ binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
+ perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
+ mysql-multilib_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # Set file limits higher so tests run
+ ulimit -n 3000
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+ --suite-timeout=5000 --testcase-timeout=30
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c353e96..286fe04 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -419,7 +419,7 @@ mysql-cmake_src_install() {
esac
einfo "Building default my.cnf (${mysql_mycnf_version})"
insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- doins "${S}"/scripts/mysqlaccess.conf
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
mycnf_src="my.cnf-${mysql_mycnf_version}"
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
"${FILESDIR}/${mycnf_src}" \
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index ca4d6c3..cbf3fac 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -257,7 +257,7 @@ else
fi
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
- mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0="
+ mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} >=dev-libs/boost-1.56.0:0="
fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
@@ -506,14 +506,14 @@ multilib_src_configure() {
filter-flags "-O" "-O[01]"
CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
- CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+ CXXFLAGS="${CXXFLAGS} -felide-constructors"
# Causes linkage failures. Upstream bug #59607 removes it
if ! mysql_version_is_at_least "5.6" ; then
CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
fi
# As of 5.7, exceptions are used!
if ! mysql_version_is_at_least "5.7" ; then
- CXXFLAGS="${CXXFLAGS} -fno-exceptions"
+ CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
fi
export CXXFLAGS
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-10-03 13:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-01 2:47 [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2014-10-03 13:30 Brian Evans
2014-01-23 4:18 Brian Evans
2011-03-26 20:42 Jorge Manuel B. S. Vicetto
2011-03-21 2:35 Jorge Manuel B. S. Vicetto
2011-03-17 4:43 Jorge Manuel B. S. Vicetto
2011-03-17 3:55 Jorge Manuel B. S. Vicetto
2011-03-17 3:15 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox