Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
Date: Tue, 03 Jan 2017 21:37:52
Message-Id: 1483479079.1e70022facc519de2f3b12c26191f0a021faa862.grknight@gentoo
1 commit: 1e70022facc519de2f3b12c26191f0a021faa862
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 3 21:31:19 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 3 21:31:19 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1e70022f
7
8 dev-db/mysql: Version bump in 5.7 series.
9
10 Just about done but needs major tree work to be included
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13 Manifest-Sign-Key: D1F781EFF9F4A3B6
14
15 dev-db/mysql/ChangeLog | 8 +-
16 dev-db/mysql/Manifest | 23 +++++
17 dev-db/mysql/mysql-5.7.17.ebuild | 210 +++++++++++++++++++++++++++++++++++++++
18 3 files changed, 240 insertions(+), 1 deletion(-)
19
20 diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
21 index d98dac7..e290fc0 100644
22 --- a/dev-db/mysql/ChangeLog
23 +++ b/dev-db/mysql/ChangeLog
24 @@ -1,7 +1,13 @@
25 # ChangeLog for dev-db/mysql
26 -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
27 +# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
28 # $Id$
29
30 +*mysql-5.7.17 (03 Jan 2017)
31 +
32 + 03 Jan 2017; Brian Evans <grknight@g.o> +mysql-5.7.17.ebuild:
33 + dev-db/mysql: Version bump in 5.7 series. Just about done but needs major
34 + tree work to be included
35 +
36 29 Apr 2016; Brian Evans <grknight@g.o> mysql-5.7.12.ebuild:
37 dev-db/mysql: Force a download of boost-1.59 and use it in the build. Only a
38 portion is actually used
39
40 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
41 index 5ee3cdf..1703e16 100644
42 --- a/dev-db/mysql/Manifest
43 +++ b/dev-db/mysql/Manifest
44 @@ -1,3 +1,6 @@
45 +-----BEGIN PGP SIGNED MESSAGE-----
46 +Hash: SHA256
47 +
48 DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
49 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
50 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
51 @@ -8,6 +11,7 @@ DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562
52 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
53 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
54 DIST mysql-5.7.12.tar.gz 50571897 SHA256 32843cb6d22ab22cd2340262b53c0d6009b5bd41b1fa4102beda19635a5c1c87 SHA512 a36013f3af9a15f8e9abec7673485ca1dd5532afcc0e2570659f510da1a1763af8de478231c5723d2395f635a6956d1500652999fedf344f7d8970265860eea5 WHIRLPOOL 9d0486ae3b8ab404f5e03829d12a477f8a990a959e32286d4920fd8bdf18689e693249be3a9f0e93e61c6a6e953846e1546620ecdeb834c4e69c45bf676a2670
55 +DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
56 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
57 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
58 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
59 @@ -16,3 +20,22 @@ DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a
60 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
61 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
62 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
63 +-----BEGIN PGP SIGNATURE-----
64 +Version: GnuPG v2
65 +
66 +iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlhsGCdfFIAAAAAALgAo
67 +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
68 +QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
69 +o7ZbuxAAxTdP9YqM+Iv9cWrH3RVWP1RZpxCtDUIirM5c3PE88V1cZo9Aalujp7rC
70 +A4aOMcUQa4f2kJcgt4sDDEnn1eWTdlKHd4FNb0v8NF0Gk0JyO5i0Jx6YH4Aez1UP
71 ++f2wb3IA82H/GEJgp33F03+fzMjkscMZpEafARDwyrAWNjgEe58guOD39jnLgCR+
72 +RjifAD8isQ1Cv+FSrWZ4hIflBVaQbE6YqKxMqRlvpwK636dmpH+mvUhzljaX3+7A
73 +FzihMfKMKMhaYy8kXbZYVnHzZPlu4EAq1pZ7QCxv5qX3IoCiU8hsCzpNzhy8JiRO
74 +ETnW/c0gKjHdp+10chcQfcSohrP+9HWjSYi79JwnA4FEs8H1kGR7UsTQTO/+Hs0G
75 +WV++yR91slnV8TQhUVV6gU+3FZcEeSqzAtAhdxl7umUAV57ArekxqM1ezKUvvCF1
76 +UDAEk3fCFWSpCh75Oq2dq2jyYSqvTKrbmanDjiUAsx7yGsPNnIlkiKLydRns9N/7
77 +PoeejdQvzsb9qCmGiy270opLaB+2BpcJT0yFwikQvKvPyQe36jbQLdAjGxnUKbr5
78 +XUVRtahN4bK62bzFGwL2PXUuHK9gAUHLT0A0hUnFgs1ZixihNuDMrbjDq77xUSOb
79 +ZEect3ybZNxb436eFyGqGUxPTOmA8LBZe7B5lSowquf9OGtDXAE=
80 +=OCNp
81 +-----END PGP SIGNATURE-----
82
83 diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
84 new file mode 100644
85 index 0000000..8a6a1f9
86 --- /dev/null
87 +++ b/dev-db/mysql/mysql-5.7.17.ebuild
88 @@ -0,0 +1,210 @@
89 +# Copyright 1999-2017 Gentoo Foundation
90 +# Distributed under the terms of the GNU General Public License v2
91 +# $Id$
92 +
93 +EAPI="6"
94 +
95 +MY_EXTRAS_VER="live"
96 +MY_PV="${PV//_alpha_pre/-m}"
97 +MY_PV="${MY_PV//_/-}"
98 +SUBSLOT="20"
99 +
100 +SERVER_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${MY_PV}.tar.gz"
101 +MY_SOURCEDIR="${PN}-${MY_PV}"
102 +inherit mysql-multilib-r1
103 +
104 +IUSE="cjk"
105 +
106 +# REMEMBER: also update eclass/mysql*.eclass before committing!
107 +KEYWORDS="~alpha ~amd64 ~arm ~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"
108 +
109 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
110 +EPATCH_EXCLUDE=''
111 +
112 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
113 + >=app-arch/lz4-0_p131:=
114 + cjk? ( app-text/mecab )"
115 +RDEPEND="${RDEPEND}"
116 +
117 +MY_PATCH_DIR="${WORKDIR}/mysql-extras"
118 +
119 +PATCHES=(
120 + "${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
121 + "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
122 + "${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.7.patch
123 + "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
124 + "${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
125 + "${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
126 + "${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
127 +)
128 +
129 +# Please do not add a naive src_unpack to this ebuild
130 +# If you want to add a single patch, copy the ebuild to an overlay
131 +# and create your own mysql-extras tarball, looking at 000_index.txt
132 +
133 +src_prepare() {
134 + mysql-multilib-r1_src_prepare
135 + if use libressl ; then
136 + sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
137 + "${S}/cmake/ssl.cmake" || die
138 + fi
139 + # Remove dozens of test only plugins by deleting them
140 + if ! use test ; then
141 + rm -r "${S}"/plugin/{test_service_sql_api,test_services,udf_services} || die
142 + fi
143 + # Remove CJK Fulltext plugin
144 + if ! use cjk ; then
145 + rm -r "${S}"/plugin/fulltext || die
146 + fi
147 +}
148 +
149 +src_configure() {
150 + local MYSQL_CMAKE_NATIVE_DEFINES=(
151 + -DWITH_LZ4=system
152 + -DWITH_NUMA=OFF
153 + -DWITH_BOOST="${S}/boost/boost_1_59_0"
154 + )
155 + # This is the CJK fulltext plugin, not related to the complete fulltext indexing
156 + if use cjk ; then
157 + MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITH_MECAB=system )
158 + else
159 + MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_FULLTEXT=1 )
160 + fi
161 + mysql-multilib-r1_src_configure
162 +}
163 +
164 +# Official test instructions:
165 +# USE='server embedded extraengine perl openssl static-libs' \
166 +# FEATURES='test userpriv -usersandbox' \
167 +# ebuild mysql-X.X.XX.ebuild \
168 +# digest clean package
169 +multilib_src_test() {
170 +
171 + if ! multilib_is_native_abi ; then
172 + einfo "Server tests not available on non-native abi".
173 + return 0;
174 + fi
175 +
176 + local TESTDIR="${BUILD_DIR}/mysql-test"
177 + local retstatus_unit
178 + local retstatus_tests
179 +
180 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
181 + # localhost. Also causes weird failures.
182 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
183 +
184 + if use server ; then
185 +
186 + if [[ $UID -eq 0 ]]; then
187 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
188 + fi
189 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
190 +
191 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
192 + addpredict /this-dir-does-not-exist/t9.MYI
193 +
194 + # Run CTest (test-units)
195 + cmake-utils_src_test
196 + retstatus_unit=$?
197 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
198 +
199 + # Ensure that parallel runs don't die
200 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
201 + # Enable parallel testing, auto will try to detect number of cores
202 + # You may set this by hand.
203 + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
204 + export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
205 +
206 + # create directories because mysqladmin might right out of order
207 + mkdir -p "${T}"/var-tests{,/log}
208 +
209 + # create symlink for the tests to find mysql_tzinfo_to_sql
210 + ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
211 +
212 + # These are failing in MySQL 5.5/5.6 for now and are believed to be
213 + # false positives:
214 + #
215 + # main.information_schema, binlog.binlog_statement_insert_delayed,
216 + # funcs_1.is_triggers funcs_1.is_tables_mysql,
217 + # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
218 + # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
219 + # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
220 + # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
221 + # fails due to USE=-latin1 / utf8 default
222 + #
223 + # main.mysql_client_test:
224 + # segfaults at random under Portage only, suspect resource limits.
225 + #
226 + # rpl.rpl_plugin_load
227 + # fails due to included file not listed in expected result
228 + # appears to be poor planning
229 + #
230 + # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
231 + # fails due to bad cleanup of previous tests when run in parallel
232 + # The tool is deprecated anyway
233 + # Bug 532288
234 + #
235 + # main.events2
236 + # Event creation is in the past and automatically dropped
237 + for t in \
238 + binlog.binlog_mysqlbinlog_filter \
239 + binlog.binlog_statement_insert_delayed \
240 + funcs_1.is_columns_mysql \
241 + funcs_1.is_tables_mysql \
242 + funcs_1.is_triggers \
243 + main.information_schema \
244 + main.mysql_client_test \
245 + main.mysqld--help-notwin \
246 + perfschema.binlog_edge_mix \
247 + perfschema.binlog_edge_stmt \
248 + rpl.rpl_plugin_load \
249 + main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
250 + main.events_2 \
251 + ; do
252 + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
253 + done
254 +
255 + if ! use extraengine ; then
256 + # bug 401673, 530766
257 + for t in federated.federated_plugin ; do
258 + mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
259 + done
260 + fi
261 +
262 + if ! use cjk ; then
263 + for t in innodb_fts.ngram_2 innodb_fts.ngram_1 innodb_fts.ngram ; do
264 + mysql-multilib-r1_disable_test "$t" "Test $t requires USE=cjk"
265 + done
266 + fi
267 +
268 + # Run mysql tests
269 + pushd "${TESTDIR}"
270 +
271 + # Set file limits higher so tests run
272 +# ulimit -n 3000
273 +
274 + # run mysql-test tests
275 + perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
276 + --suite-timeout=5000 --reorder
277 + retstatus_tests=$?
278 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
279 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
280 +
281 + popd
282 +
283 + # Cleanup is important for these testcases.
284 + pkill -9 -f "${S}/ndb" 2>/dev/null
285 + pkill -9 -f "${S}/sql" 2>/dev/null
286 +
287 + failures=""
288 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
289 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
290 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
291 +
292 + [[ -z "$failures" ]] || die "Test failures: $failures"
293 + einfo "Tests successfully completed"
294 +
295 + else
296 + einfo "Skipping server tests due to minimal build."
297 + fi
298 +}