1 |
commit: 3a5b769605823b8c7f9b8c38af6303616cd89f1b |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 2 18:53:38 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 2 18:53:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5b7696 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.0.25 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.0.25.ebuild | 186 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 187 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index 4f04398..b4ea24d 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -1,5 +1,6 @@ |
21 |
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e |
22 |
DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64 |
23 |
+DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c |
24 |
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d |
25 |
DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d |
26 |
DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3 |
27 |
|
28 |
diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild |
29 |
new file mode 100644 |
30 |
index 0000000..22b5004 |
31 |
--- /dev/null |
32 |
+++ b/dev-db/mariadb/mariadb-10.0.25.ebuild |
33 |
@@ -0,0 +1,186 @@ |
34 |
+# Copyright 1999-2016 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI="6" |
39 |
+MY_EXTRAS_VER="20151223-1501Z" |
40 |
+SUBSLOT="18" |
41 |
+MYSQL_PV_MAJOR="5.6" |
42 |
+ |
43 |
+inherit toolchain-funcs mysql-multilib-r1 |
44 |
+ |
45 |
+HOMEPAGE="http://mariadb.org/" |
46 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
47 |
+ |
48 |
+IUSE="bindist odbc oqgraph pam sphinx tokudb xml" |
49 |
+RESTRICT="!bindist? ( bindist )" |
50 |
+ |
51 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )" |
52 |
+ |
53 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
54 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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" |
55 |
+ |
56 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
57 |
+PATCHES=( |
58 |
+ "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
59 |
+ "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch" |
60 |
+ "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.15.patch" |
61 |
+ "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
62 |
+ "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
63 |
+) |
64 |
+COMMON_DEPEND=" |
65 |
+ !bindist? ( >=sys-libs/readline-4.1:0= ) |
66 |
+ server? ( |
67 |
+ extraengine? ( |
68 |
+ odbc? ( dev-db/unixODBC:0= ) |
69 |
+ xml? ( dev-libs/libxml2:2= ) |
70 |
+ ) |
71 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
72 |
+ pam? ( virtual/pam:0= ) |
73 |
+ tokudb? ( app-arch/snappy ) |
74 |
+ ) |
75 |
+ >=dev-libs/libpcre-8.35:3= |
76 |
+" |
77 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
78 |
+ ${COMMON_DEPEND}" |
79 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
80 |
+ perl? ( !dev-db/mytop |
81 |
+ virtual/perl-Getopt-Long |
82 |
+ dev-perl/TermReadKey |
83 |
+ virtual/perl-Term-ANSIColor |
84 |
+ virtual/perl-Time-HiRes ) |
85 |
+" |
86 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
87 |
+ |
88 |
+src_configure(){ |
89 |
+ # bug 508724 mariadb cannot use ld.gold |
90 |
+ tc-ld-disable-gold |
91 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
92 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
93 |
+ -DWITH_PCRE=system |
94 |
+ ) |
95 |
+ if use server ; then |
96 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
97 |
+ if ! use extraengine ; then |
98 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
99 |
+ -DWITHOUT_FEDERATED=1 |
100 |
+ -DWITHOUT_FEDERATEDX=1 ) |
101 |
+ fi |
102 |
+ |
103 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
104 |
+ $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
105 |
+ $(mysql-cmake_use_plugin sphinx SPHINX) |
106 |
+ $(mysql-cmake_use_plugin tokudb TOKUDB) |
107 |
+ $(mysql-cmake_use_plugin pam AUTH_PAM) |
108 |
+ -DWITHOUT_CASSANDRA=0 |
109 |
+ $(mysql-cmake_use_plugin extraengine SEQUENCE) |
110 |
+ $(mysql-cmake_use_plugin extraengine SPIDER) |
111 |
+ $(mysql-cmake_use_plugin extraengine CONNECT) |
112 |
+ -DCONNECT_WITH_MYSQL=1 |
113 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
114 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
115 |
+ -DWITHOUT_MROONGA=1 |
116 |
+ ) |
117 |
+ fi |
118 |
+ mysql-multilib-r1_src_configure |
119 |
+} |
120 |
+ |
121 |
+# Official test instructions: |
122 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
123 |
+# FEATURES='test userpriv -usersandbox' \ |
124 |
+# ebuild mariadb-X.X.XX.ebuild \ |
125 |
+# digest clean package |
126 |
+multilib_src_test() { |
127 |
+ |
128 |
+ if ! multilib_is_native_abi ; then |
129 |
+ einfo "Server tests not available on non-native abi". |
130 |
+ return 0; |
131 |
+ fi |
132 |
+ |
133 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
134 |
+ local retstatus_unit |
135 |
+ local retstatus_tests |
136 |
+ |
137 |
+ if use server ; then |
138 |
+ |
139 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
140 |
+ # localhost. Also causes weird failures. |
141 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
142 |
+ |
143 |
+ if [[ $UID -eq 0 ]]; then |
144 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
145 |
+ fi |
146 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
147 |
+ |
148 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
149 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
150 |
+ |
151 |
+ # Run CTest (test-units) |
152 |
+ cmake-utils_src_test |
153 |
+ retstatus_unit=$? |
154 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
155 |
+ |
156 |
+ # Ensure that parallel runs don't die |
157 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
158 |
+ # Enable parallel testing, auto will try to detect number of cores |
159 |
+ # You may set this by hand. |
160 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
161 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
162 |
+ |
163 |
+ # create directories because mysqladmin might run out of order |
164 |
+ mkdir -p "${T}"/var-tests{,/log} |
165 |
+ |
166 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
167 |
+ # false positives: |
168 |
+ # |
169 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
170 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
171 |
+ # funcs_1.is_columns_mysql main.bootstrap |
172 |
+ # fails due to USE=-latin1 / utf8 default |
173 |
+ # |
174 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
175 |
+ # main.mysql_client_test_comp: |
176 |
+ # segfaults at random under Portage only, suspect resource limits. |
177 |
+ # |
178 |
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
179 |
+ # fails due to bad cleanup of previous tests when run in parallel |
180 |
+ # The tool is deprecated anyway |
181 |
+ # Bug 532288 |
182 |
+ |
183 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
184 |
+ main.mysql_client_test_comp \ |
185 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
186 |
+ main.mysqld--help main.bootstrap \ |
187 |
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
188 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
189 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
190 |
+ done |
191 |
+ |
192 |
+ # Run mysql tests |
193 |
+ pushd "${TESTDIR}" || die |
194 |
+ |
195 |
+ # run mysql-test tests |
196 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
197 |
+ |
198 |
+ retstatus_tests=$? |
199 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
200 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
201 |
+ |
202 |
+ popd || die |
203 |
+ |
204 |
+ # Cleanup is important for these testcases. |
205 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
206 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
207 |
+ |
208 |
+ failures="" |
209 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
210 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
211 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
212 |
+ |
213 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
214 |
+ einfo "Tests successfully completed" |
215 |
+ |
216 |
+ else |
217 |
+ einfo "Skipping server tests due to minimal build." |
218 |
+ fi |
219 |
+} |