1 |
robbat2 14/07/29 23:10:04 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mariadb-10.0.12.ebuild |
5 |
Log: |
6 |
Bring MySQL 5.6/MariaDB 10.0 from the overlay into the tree. Thanks to the great work of Brian Evans <grknight@g.o>. ~arm temporarily dropped pending bug #518506. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit) |
9 |
|
10 |
Revision Changes Path |
11 |
1.41 dev-db/mariadb/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.41&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.41&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?r1=1.40&r2=1.41 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v |
20 |
retrieving revision 1.40 |
21 |
retrieving revision 1.41 |
22 |
diff -p -w -b -B -u -u -r1.40 -r1.41 |
23 |
--- ChangeLog 29 Jul 2014 03:28:26 -0000 1.40 |
24 |
+++ ChangeLog 29 Jul 2014 23:10:04 -0000 1.41 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-db/mariadb |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.40 2014/07/29 03:28:26 grknight Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.41 2014/07/29 23:10:04 robbat2 Exp $ |
30 |
+ |
31 |
+*mariadb-10.0.12 (29 Jul 2014) |
32 |
+ |
33 |
+ 29 Jul 2014; Robin H. Johnson <robbat2@g.o> +mariadb-10.0.12.ebuild: |
34 |
+ Bring MySQL 5.6/MariaDB 10.0 from the overlay into the tree. Thanks to the |
35 |
+ great work of Brian Evans <grknight@g.o>. ~arm temporarily dropped |
36 |
+ pending bug #518506. |
37 |
|
38 |
*mariadb-5.5.38-r1 (29 Jul 2014) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-db/mariadb/mariadb-10.0.12.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: mariadb-10.0.12.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild,v 1.1 2014/07/29 23:10:04 robbat2 Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
MY_EXTRAS_VER="20140729-2200Z" |
56 |
|
57 |
# Build system |
58 |
BUILD="cmake" |
59 |
|
60 |
inherit toolchain-funcs mysql-v2 |
61 |
# only to make repoman happy. it is really set in the eclass |
62 |
IUSE="$IUSE" |
63 |
|
64 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
65 |
KEYWORDS="~alpha ~amd64 ~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" |
66 |
|
67 |
# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
68 |
EPATCH_EXCLUDE='' |
69 |
|
70 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
71 |
RDEPEND="${RDEPEND}" |
72 |
|
73 |
# Official test instructions: |
74 |
# USE='-cluster embedded extraengine perl ssl static-libs community' \ |
75 |
# FEATURES='test userpriv -usersandbox' \ |
76 |
# ebuild mariadb-X.X.XX.ebuild \ |
77 |
# digest clean package |
78 |
src_test() { |
79 |
|
80 |
local TESTDIR="${BUILD_DIR}/mysql-test" |
81 |
local retstatus_unit |
82 |
local retstatus_tests |
83 |
|
84 |
# Bug #213475 - MySQL _will_ object strenously if your machine is named |
85 |
# localhost. Also causes weird failures. |
86 |
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
87 |
|
88 |
if ! use "minimal" ; then |
89 |
|
90 |
if [[ $UID -eq 0 ]]; then |
91 |
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
92 |
fi |
93 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
94 |
|
95 |
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
96 |
addpredict /this-dir-does-not-exist/t9.MYI |
97 |
|
98 |
# Run CTest (test-units) |
99 |
cmake-utils_src_test |
100 |
retstatus_unit=$? |
101 |
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
102 |
|
103 |
# Ensure that parallel runs don't die |
104 |
export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
105 |
|
106 |
# create directories because mysqladmin might right out of order |
107 |
mkdir -p "${S}"/mysql-test/var-tests{,/log} |
108 |
|
109 |
# These are failing in MariaDB 10.0 for now and are believed to be |
110 |
# false positives: |
111 |
# |
112 |
# main.information_schema, binlog.binlog_statement_insert_delayed, |
113 |
# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
114 |
# funcs_1.is_columns_mysql |
115 |
# fails due to USE=-latin1 / utf8 default |
116 |
# |
117 |
# main.mysql_client_test, main.mysql_client_test_nonblock: |
118 |
# segfaults at random under Portage only, suspect resource limits. |
119 |
# |
120 |
# plugins.unix_socket |
121 |
# fails because portage strips out the USER enviornment variable |
122 |
# |
123 |
|
124 |
for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
125 |
binlog.binlog_statement_insert_delayed main.information_schema \ |
126 |
main.mysqld--help plugins.unix_socket \ |
127 |
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
128 |
mysql-v2_disable_test "$t" "False positives in Gentoo" |
129 |
done |
130 |
|
131 |
# Run mysql tests |
132 |
pushd "${TESTDIR}" |
133 |
|
134 |
# run mysql-test tests |
135 |
# Skip all CONNECT engine tests until upstream respondes to how to reference data files |
136 |
perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \ |
137 |
--skip-test=connect --parallel=auto |
138 |
retstatus_tests=$? |
139 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
140 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
141 |
|
142 |
popd |
143 |
|
144 |
# Cleanup is important for these testcases. |
145 |
pkill -9 -f "${S}/ndb" 2>/dev/null |
146 |
pkill -9 -f "${S}/sql" 2>/dev/null |
147 |
|
148 |
failures="" |
149 |
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
150 |
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
151 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
152 |
|
153 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
154 |
einfo "Tests successfully completed" |
155 |
|
156 |
else |
157 |
|
158 |
einfo "Skipping server tests due to minimal build." |
159 |
fi |
160 |
} |