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