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