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 188AC138247 for ; Sat, 18 Jan 2014 23:28:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB56CE0AAA; Sat, 18 Jan 2014 23:28:24 +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 713C2E0AAA for ; Sat, 18 Jan 2014 23:28:24 +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 7251333F8C6 for ; Sat, 18 Jan 2014 23:28:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2E5B118096 for ; Sat, 18 Jan 2014 23:28:22 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1390087355.a819369036821327db13cf0eeabdcde6339243c3.jmbsvicetto@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-5.5.32-r1.ebuild eclass/mysql-cmake.eclass X-VCS-Directories: dev-db/mariadb/ eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: a819369036821327db13cf0eeabdcde6339243c3 X-VCS-Branch: master Date: Sat, 18 Jan 2014 23:28:22 +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: 9adc7228-2898-42a4-8f67-7c0a3fd6414e X-Archives-Hash: 7caabcb4a127347347056ec1a94df129 commit: a819369036821327db13cf0eeabdcde6339243c3 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sat Jan 18 23:22:35 2014 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sat Jan 18 23:22:35 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a8193690 Add mariadb-5.5.32-r1 to test a cmake patch to split the location of embedded from client libs. --- dev-db/mariadb/Manifest | 1 + dev-db/mariadb/mariadb-5.5.32-r1.ebuild | 128 ++++++++++++++++++++++++++++++++ eclass/mysql-cmake.eclass | 11 +-- 3 files changed, 135 insertions(+), 5 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 54d9862..6d6f949 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -8,3 +8,4 @@ DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84 DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e +DIST mysql-extras-20140117-1443Z.tar.bz2 1479705 SHA256 759309bda0b6a5e0d094f20b0aea4ee7259710532e68511194bca952107442a9 SHA512 b3acf17c75ff9cdd2c467080a0fe10b1d6210dcdde76bc1902f6dd53a06fe6b2b3b216dd3aabf9bf2ff0d68f54267c9618645f19daaea829292fb88a31b822f5 WHIRLPOOL 2cffc52a9162fb3f3b91ec13c099ecf99c82fd84087ddbe67761f7052a3e13f2eebb6fb5715655688f472ad320fc0c295dff7be93c767435c4f3493903c3e3e7 diff --git a/dev-db/mariadb/mariadb-5.5.32-r1.ebuild b/dev-db/mariadb/mariadb-5.5.32-r1.ebuild new file mode 100644 index 0000000..b22f460 --- /dev/null +++ b/dev-db/mariadb/mariadb-5.5.32-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $ + +EAPI="4" +MY_EXTRAS_VER="20140117-1443Z" + +# Build system +BUILD="cmake" + +inherit toolchain-funcs mysql-v2 +# 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}" + +# 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 mariadb-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, 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. + # + # 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' + # + # main.openssl_1 + # error message changing + # -mysqltest: Could not open connection 'default': 2026 SSL connection + # error: ASN: bad other signature confirmation + # +mysqltest: Could not open connection 'default': 2026 SSL connection + # error: error:00000001:lib(0):func(0):reason(1) + # + # 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 main.flush_read_lock_kill \ + sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do + mysql-v2_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 4da7ede..615a579 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -311,7 +311,8 @@ mysql-cmake_src_configure() { -DINSTALL_DOCREADMEDIR=share/doc/${P} -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_INFODIR=share/info - -DINSTALL_LIBDIR=$(get_libdir)/mysql + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_ELIBDIR=$(get_libdir)/mysql -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql @@ -471,10 +472,10 @@ mysql-cmake_src_install() { done fi - cat <<-EOF > "${T}"/80mysql-libdir - LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql" - EOF - doenvd "${T}"/80mysql-libdir +# cat <<-EOF > "${T}"/80mysql-libdir +# LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql" +# EOF +# doenvd "${T}"/80mysql-libdir #Remove mytop if perl is not selected [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \