1 |
commit: 913204166ac624dc48a240b1eb0bdb9cfcd964be |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 3 02:55:18 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 3 02:55:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91320416 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.0.34 |
9 |
|
10 |
Package-Manager: Portage-2.3.23, Repoman-2.3.6 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.0.34.ebuild | 209 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 210 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index 0b76f64c29d..91a8a7db9f4 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -1,6 +1,7 @@ |
21 |
DIST mariadb-10.0.30.tar.gz 63433598 BLAKE2B ccf5b1650a4134cdcdd99bf52b0e6441f3255a938bddc050418ac8766e8301dadde92e7a349fa6f0b9338304790121ace7d5da9fe8bb86f2ed553f37809c8daa SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 |
22 |
DIST mariadb-10.0.32.tar.gz 63567828 BLAKE2B c12e5be440ff23ed600a159a22c0f925dc5308fff3f1f832c215cd32cdfad9224d03b4af8603fb7b13162ece8373b891e5c91d8c846ff55a34011e74b1d58c20 SHA512 e1ecfc2b819b5ffa72fc0d4131fc9d7b6811919e10f15608830611028746580731c653a6b3eb43c92640cd29716b6278f48d27af5322dd2084f2d5f356e6f628 |
23 |
DIST mariadb-10.0.33.tar.gz 69211872 BLAKE2B 02efa97a75ff13655e9a6d6ba562c4d14bd749b4873ac2f783f32494104f00517c2af63805afa552b6ba707aa412d61b8b3561d5d4d534bf9ad5c6f67b33cfe4 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104 |
24 |
+DIST mariadb-10.0.34.tar.gz 69266294 BLAKE2B ee8157d1b4d5d4cc096159efb3a20321486092eb28f35d120ee99b2260e52f46d1803b62df29a4fc905de23aa009dbb4666e8457903d97d5fdb14dcbfdda4b2c SHA512 46539ef37ec3b2fb00e7d546f3bbfe48eb86d0403d33e50b1bca40c145d69ca3ac8ddaa72ddb0c1f0aa41f3177aedfe1c6c0bdb7949d47efe49aed3ed52bd47b |
25 |
DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388634b80a8b10637744c3d11f9cad15329c9a1725cb836f7249352d5bdf9471bc9c3f254e1ef96229716543f235f7ed SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 |
26 |
DIST mariadb-10.1.26.tar.gz 61887132 BLAKE2B 2397e9d0b0f7dd126ff6b50a90996da734a30b6e49028dd2ad06c93b70faa0415184ce66840fc8d92a974acd0013f5cc1b2e7d1dc8214136a95d354ae2272bb7 SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b |
27 |
DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd |
28 |
|
29 |
diff --git a/dev-db/mariadb/mariadb-10.0.34.ebuild b/dev-db/mariadb/mariadb-10.0.34.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..3375434f0e1 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mariadb/mariadb-10.0.34.ebuild |
34 |
@@ -0,0 +1,209 @@ |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI="6" |
39 |
+MY_EXTRAS_VER="20170926-1321Z" |
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="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) 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 ~x86-fbsd ~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.33.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 |
+ sys-libs/zlib[minizip] |
72 |
+ ) |
73 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
74 |
+ pam? ( virtual/pam:0= ) |
75 |
+ tokudb? ( app-arch/snappy ) |
76 |
+ ) |
77 |
+ >=dev-libs/libpcre-8.41-r1:3=[${MULTILIB_USEDEP}] |
78 |
+" |
79 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
80 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
81 |
+ ${COMMON_DEPEND}" |
82 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
83 |
+ perl? ( !dev-db/mytop |
84 |
+ virtual/perl-Getopt-Long |
85 |
+ dev-perl/TermReadKey |
86 |
+ virtual/perl-Term-ANSIColor |
87 |
+ virtual/perl-Time-HiRes ) |
88 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
89 |
+" |
90 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
91 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
92 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
93 |
+ |
94 |
+pkg_setup() { |
95 |
+ java-pkg-opt-2_pkg_setup |
96 |
+ mysql-multilib-r1_pkg_setup |
97 |
+} |
98 |
+ |
99 |
+pkg_preinst() { |
100 |
+ java-pkg-opt-2_pkg_preinst |
101 |
+ mysql-multilib-r1_pkg_preinst |
102 |
+} |
103 |
+ |
104 |
+src_prepare() { |
105 |
+ java-pkg-opt-2_src_prepare |
106 |
+ mysql-multilib-r1_src_prepare |
107 |
+} |
108 |
+ |
109 |
+src_configure(){ |
110 |
+ # bug 508724 mariadb cannot use ld.gold |
111 |
+ tc-ld-disable-gold |
112 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
113 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
114 |
+ -DWITH_PCRE=system |
115 |
+ ) |
116 |
+ if use server ; then |
117 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
118 |
+ if ! use extraengine ; then |
119 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
120 |
+ -DWITHOUT_FEDERATED=1 |
121 |
+ -DWITHOUT_FEDERATEDX=1 ) |
122 |
+ fi |
123 |
+ |
124 |
+ # Connect with Zip is currently broken and does not compile |
125 |
+ # Reported upstream https://jira.mariadb.org/browse/MDEV-11809 |
126 |
+ |
127 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
128 |
+ $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
129 |
+ $(mysql-cmake_use_plugin sphinx SPHINX) |
130 |
+ $(mysql-cmake_use_plugin tokudb TOKUDB) |
131 |
+ $(mysql-cmake_use_plugin pam AUTH_PAM) |
132 |
+ $(mysql-cmake_use_plugin extraengine SEQUENCE) |
133 |
+ $(mysql-cmake_use_plugin extraengine SPIDER) |
134 |
+ $(mysql-cmake_use_plugin extraengine CONNECT) |
135 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
136 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
137 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
138 |
+ -DWITHOUT_MROONGA=1 |
139 |
+ ) |
140 |
+ fi |
141 |
+ mysql-multilib-r1_src_configure |
142 |
+} |
143 |
+ |
144 |
+# Official test instructions: |
145 |
+# USE='extraengine perl server openssl static-libs' \ |
146 |
+# FEATURES='test userpriv -usersandbox' \ |
147 |
+# ebuild mariadb-X.X.XX.ebuild \ |
148 |
+# digest clean package |
149 |
+multilib_src_test() { |
150 |
+ |
151 |
+ if ! multilib_is_native_abi ; then |
152 |
+ einfo "Server tests not available on non-native abi". |
153 |
+ return 0; |
154 |
+ fi |
155 |
+ |
156 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
157 |
+ local retstatus_unit |
158 |
+ local retstatus_tests |
159 |
+ |
160 |
+ if use server ; then |
161 |
+ |
162 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
163 |
+ # localhost. Also causes weird failures. |
164 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
165 |
+ |
166 |
+ if [[ $UID -eq 0 ]]; then |
167 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
168 |
+ fi |
169 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
170 |
+ |
171 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
172 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
173 |
+ |
174 |
+ # Run CTest (test-units) |
175 |
+ cmake-utils_src_test |
176 |
+ retstatus_unit=$? |
177 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
178 |
+ |
179 |
+ # Ensure that parallel runs don't die |
180 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
181 |
+ # Enable parallel testing, auto will try to detect number of cores |
182 |
+ # You may set this by hand. |
183 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
184 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
185 |
+ |
186 |
+ # create directories because mysqladmin might run out of order |
187 |
+ mkdir -p "${T}"/var-tests{,/log} |
188 |
+ |
189 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
190 |
+ # false positives: |
191 |
+ # |
192 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
193 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
194 |
+ # funcs_1.is_columns_mysql main.bootstrap |
195 |
+ # fails due to USE=-latin1 / utf8 default |
196 |
+ # |
197 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
198 |
+ # main.mysql_client_test_comp: |
199 |
+ # segfaults at random under Portage only, suspect resource limits. |
200 |
+ # |
201 |
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
202 |
+ # fails due to bad cleanup of previous tests when run in parallel |
203 |
+ # The tool is deprecated anyway |
204 |
+ # Bug 532288 |
205 |
+ |
206 |
+#main.bootstrap \ |
207 |
+ for t in connect.drop-open-error ; do |
208 |
+# main.mysql_client_test_comp \ |
209 |
+# binlog.binlog_statement_insert_delayed main.information_schema \ |
210 |
+# main.mysqld--help \ |
211 |
+# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
212 |
+# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
213 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
214 |
+ done |
215 |
+ |
216 |
+ # Run mysql tests |
217 |
+ pushd "${TESTDIR}" || die |
218 |
+ |
219 |
+ # run mysql-test tests |
220 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
221 |
+ |
222 |
+ retstatus_tests=$? |
223 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
224 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
225 |
+ |
226 |
+ popd || die |
227 |
+ |
228 |
+ # Cleanup is important for these testcases. |
229 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
230 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
231 |
+ |
232 |
+ failures="" |
233 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
234 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
235 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
236 |
+ |
237 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
238 |
+ einfo "Tests successfully completed" |
239 |
+ |
240 |
+ else |
241 |
+ einfo "Skipping server tests due to minimal build." |
242 |
+ fi |
243 |
+} |