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