diff options
author | Brian Evans <grknight@gentoo.org> | 2015-07-30 22:27:34 -0400 |
---|---|---|
committer | Brian Evans <grknight@gentoo.org> | 2015-07-30 22:27:34 -0400 |
commit | c66425b1feb5c5cefdc30ffb515aeb3c28055139 (patch) | |
tree | e93af5093c4d439f7dbcbb7101bc9f329a1371b3 | |
parent | Add minimum virtual/mysql version for split packages to help transition (diff) | |
download | mysql-c66425b1.tar.gz mysql-c66425b1.tar.bz2 mysql-c66425b1.zip |
Version bump with eclass additions
-rw-r--r-- | dev-db/mysql/Manifest | 1 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.6.26-r1.ebuild (renamed from dev-db/mysql/mysql-5.6.25-r1.ebuild) | 6 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.6.26.ebuild | 158 | ||||
-rw-r--r-- | eclass/mysql-multilib.eclass | 32 |
4 files changed, 188 insertions, 9 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 8f2737c..692f7a5 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -6,6 +6,7 @@ DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560 DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011 DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194 +DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild b/dev-db/mysql/mysql-5.6.26-r1.ebuild index b0ce8d0..a334c33 100644 --- a/dev-db/mysql/mysql-5.6.25-r1.ebuild +++ b/dev-db/mysql/mysql-5.6.26-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25-r1.ebuild,v 1.1 2015/07/28 02:26:58 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.2 2015/07/30 20:40:19 grknight Exp $ EAPI="5" @@ -27,6 +27,10 @@ RDEPEND="${RDEPEND}" # 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 +# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) +# disable until we see what happens with it +MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" + # Official test instructions: # USE='server embedded extraengine perl ssl static-libs community' \ # FEATURES='test userpriv -usersandbox' \ diff --git a/dev-db/mysql/mysql-5.6.26.ebuild b/dev-db/mysql/mysql-5.6.26.ebuild new file mode 100644 index 0000000..0323526 --- /dev/null +++ b/dev-db/mysql/mysql-5.6.26.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild,v 1.2 2015/07/30 20:40:19 grknight Exp $ + +EAPI="5" + +MY_EXTRAS_VER="20150410-1944Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" +SUBSLOT="18" + +inherit toolchain-funcs mysql-multilib +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# 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 + +# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) +# disable until we see what happens with it +MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" + +# Official test instructions: +# USE='embedded extraengine perl ssl static-libs community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + local TESTDIR="${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))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might right out of order + mkdir -p "${T}"/var-tests{,/log} + + # create symlink for the tests to find mysql_tzinfo_to_sql + ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" + + # These are failing in MySQL 5.5/5.6 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # funcs_1.is_triggers funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, + # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, + # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql + # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # rpl.rpl_plugin_load + # fails due to included file not listed in expected result + # appears to be poor planning + # + # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # fails due to bad cleanup of previous tests when run in parallel + # The tool is deprecated anyway + # Bug 532288 + for t in \ + binlog.binlog_mysqlbinlog_filter \ + binlog.binlog_statement_insert_delayed \ + funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql \ + funcs_1.is_triggers \ + main.information_schema \ + main.mysql_client_test \ + main.mysqld--help-notwin \ + perfschema.binlog_edge_mix \ + perfschema.binlog_edge_stmt \ + rpl.rpl_plugin_load \ + main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ + ; do + mysql-multilib_disable_test "$t" "False positives in Gentoo" + done + + if ! use extraengine ; then + # bug 401673, 530766 + for t in federated.federated_plugin ; do + mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" + done + fi + + # 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="${T}/var-tests" \ + --suite-timeout=5000 --reorder + 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-multilib.eclass b/eclass/mysql-multilib.eclass index 65422e4..f48024d 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.27 2015/07/30 20:34:57 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -45,6 +45,18 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_ # VARIABLES: # +# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES +# @DESCRIPTION: +# Add extra CMake arguments for native multilib builds + +# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES +# @DESCRIPTION: +# Add extra CMake arguments for non-native multilib builds + +# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES +# @DESCRIPTION: +# Add extra CMake arguments + # 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" @@ -624,13 +636,6 @@ multilib_src_configure() { -DWITH_DEFAULT_FEATURE_SET=0 ) - # systemtap only works on native ABI bug 530132 - if multilib_is_native_abi; then - mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) - else - mycmakeargs+=( -DENABLE_DTRACE=0 ) - fi - if in_iuse client-libs ; then mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) ) fi @@ -687,6 +692,17 @@ multilib_src_configure() { fi fi + # systemtap only works on native ABI bug 530132 + if multilib_is_native_abi; then + mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) + [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} ) + else + mycmakeargs+=( -DENABLE_DTRACE=0 ) + [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} ) + fi + + [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} ) + # Always build NDB with mysql-cluster for libndbclient [[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=( -DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1 |