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