From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 93C221392EF for ; Tue, 1 Jul 2014 20:48:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A49FE0959; Tue, 1 Jul 2014 20:48:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 020D1E0959 for ; Tue, 1 Jul 2014 20:48:30 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D94C340439 for ; Tue, 1 Jul 2014 20:48:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6F56D182D3 for ; Tue, 1 Jul 2014 20:48:27 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1404247677.ae6c50aa500067df76eaf18bc92acab8eda6308c.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/Manifest dev-db/mariadb/mariadb-10.1.0_alpha.ebuild eclass/mysql-cmake.eclass eclass/mysql-multilib.eclass X-VCS-Directories: dev-db/mariadb/ eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: ae6c50aa500067df76eaf18bc92acab8eda6308c X-VCS-Branch: master Date: Tue, 1 Jul 2014 20:48:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51495d98-92c4-429e-b8d6-54a908f43d08 X-Archives-Hash: 4ff3dc3cb7bddc9c9bc80767b7f01476 commit: ae6c50aa500067df76eaf18bc92acab8eda6308c Author: Brian Evans gentoo org> AuthorDate: Tue Jul 1 20:47:57 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Jul 1 20:47:57 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ae6c50aa [mariadb] Version bump to 10.1.0 Alpha --- dev-db/mariadb/Manifest | 1 + dev-db/mariadb/mariadb-10.1.0_alpha.ebuild | 109 +++++++++++++++++++++++++++++ eclass/mysql-cmake.eclass | 22 ++++-- eclass/mysql-multilib.eclass | 9 ++- 4 files changed, 130 insertions(+), 11 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index f35ad67..fdf9524 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,5 +1,6 @@ DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1 +DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 diff --git a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild new file mode 100644 index 0000000..ad99d88 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +MY_EXTRAS_VER="20140514-0124Z" + +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 ~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}" + +# Official test instructions: +# USE='-cluster embedded extraengine perl ssl static-libs community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + multilib_is_native_abi || return + + # 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 MariaDB 10.0 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test, main.mysql_client_test_nonblock: + # segfaults at random under Portage only, suspect resource limits. + # + # plugins.unix_socket + # fails because portage strips out the USER enviornment variable + # + + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help plugins.unix_socket \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do + mysql-multilib_disable_test "$t" "False positives in Gentoo" + done + + # Run mysql tests + pushd "${TESTDIR}" || die + + # run mysql-test tests + # Skip all CONNECT engine tests until upstream respondes to how to reference data files + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd || die + + # 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 908e66e..4578020 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -76,9 +76,9 @@ mysql-cmake_disable_test() { mysql-cmake_use_plugin() { [[ -z $2 ]] && die "mysql-cmake_use_plugin " if use_if_iuse $1 ; then - echo "-DWITH_$2=1" + echo "-DWITH_$2=1 -DPLUGIN_$2=YES" else - echo "-DWITHOUT_$2=1 -DWITH_$2=0" + echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO" fi } @@ -129,7 +129,15 @@ configure_cmake_minimal() { -DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1 -DWITHOUT_MYISAM_STORAGE_ENGINE=1 -DWITHOUT_PARTITION_STORAGE_ENGINE=1 - -DWITHOUT_INNOBASE_STORAGE_ENGINE=1 + -DPLUGIN_ARCHIVE=NO + -DPLUGIN_BLACKHOLE=NO + -DPLUGIN_CSV=NO + -DPLUGIN_FEDERATED=NO + -DPLUGIN_HEAP=NO + -DPLUGIN_INNOBASE=NO + -DPLUGIN_MYISAMMRG=NO + -DPLUGIN_MYISAM=NO + -DPLUGIN_PARTITION=NO ) } @@ -191,10 +199,12 @@ configure_cmake_standard() { # CassandraSE needs Apache Thrift which is not in portage mycmakeargs+=( -DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0 + -DPLUGIN_CASSANDRA=NO $(mysql-cmake_use_plugin extraengine SEQUENCE) $(mysql-cmake_use_plugin extraengine SPIDER) $(mysql-cmake_use_plugin extraengine CONNECT) -DCONNECT_WITH_MYSQL=1 + -DPLUGIN_CONNECT_WITH_MYSQL=YES $(cmake-utils_use xml CONNECT_WITH_LIBXML2) $(cmake-utils_use odbc CONNECT_WITH_ODBC) ) @@ -309,9 +319,7 @@ mysql-cmake_src_configure() { -DWITH_SSL=$(usex ssl system bundled) ) - if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then - mycmakeargs+=( -DWITH_EDITLINE=system ) - else + if in_iuse bindist ; then mycmakeargs+=( -DWITH_READLINE=$(usex bindist 1 0) -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) @@ -319,6 +327,8 @@ mysql-cmake_src_configure() { ) fi + mycmakeargs+=( -DWITH_EDITLINE=system ) + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mycmakeargs+=( -DWITH_JEMALLOC=$(usex jemalloc system) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 53df055..42f965e 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -303,7 +303,7 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-${MYSQL_PV_MAJOR}" # my_config.h includes ABI specific data -MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h ) +MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) # # HELPER FUNCTIONS: @@ -430,16 +430,15 @@ multilib_src_configure() { -DWITH_SSL=$(usex ssl system bundled) ) - if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then - mycmakeargs+=( -DWITH_EDITLINE=system ) - else + if in_iuse bindist ; then mycmakeargs+=( -DWITH_READLINE=$(usex bindist 1 0) -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) - $(usex bindist -DHAVE_BFD_H=0) + $(usex bindist -DHAVE_BFD_H=0 '') ) fi + mycmakeargs+=( -DWITH_EDITLINE=system ) if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mycmakeargs+=(