1 |
commit: d578f61aee6616b257cde64816664d15b475e1be |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 17 20:26:09 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 17 20:38:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d578f61a |
7 |
|
8 |
dev-db/mariadb: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
dev-db/mariadb/Manifest | 9 - |
13 |
dev-db/mariadb/mariadb-10.0.33.ebuild | 209 ------- |
14 |
dev-db/mariadb/mariadb-10.0.34.ebuild | 209 ------- |
15 |
dev-db/mariadb/mariadb-10.1.29.ebuild | 229 -------- |
16 |
dev-db/mariadb/mariadb-10.1.31-r1.ebuild | 244 -------- |
17 |
dev-db/mariadb/mariadb-10.1.33.ebuild | 248 -------- |
18 |
dev-db/mariadb/mariadb-10.3.7.ebuild | 960 ------------------------------- |
19 |
dev-db/mariadb/metadata.xml | 2 - |
20 |
8 files changed, 2110 deletions(-) |
21 |
|
22 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
23 |
index a93c46ab802..2a9a72ce10e 100644 |
24 |
--- a/dev-db/mariadb/Manifest |
25 |
+++ b/dev-db/mariadb/Manifest |
26 |
@@ -1,17 +1,8 @@ |
27 |
-DIST mariadb-10.0.33.tar.gz 69211872 BLAKE2B 02efa97a75ff13655e9a6d6ba562c4d14bd749b4873ac2f783f32494104f00517c2af63805afa552b6ba707aa412d61b8b3561d5d4d534bf9ad5c6f67b33cfe4 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104 |
28 |
-DIST mariadb-10.0.34.tar.gz 69266294 BLAKE2B ee8157d1b4d5d4cc096159efb3a20321486092eb28f35d120ee99b2260e52f46d1803b62df29a4fc905de23aa009dbb4666e8457903d97d5fdb14dcbfdda4b2c SHA512 46539ef37ec3b2fb00e7d546f3bbfe48eb86d0403d33e50b1bca40c145d69ca3ac8ddaa72ddb0c1f0aa41f3177aedfe1c6c0bdb7949d47efe49aed3ed52bd47b |
29 |
DIST mariadb-10.0.35.tar.gz 66551252 BLAKE2B 69cc9c78f7c47a4b1760940cb0f395b4053fcc47c1087a0c2af873d4a998ee60915e1f4e64f7fe6474c7c1fa3dabe48a3b6621c67893b20526f01e56b0542e7a SHA512 01fc8d48be3f3847bb222835436ab938c6c5b5ac8ba6cc87b3b6d2a2201b7ab4b152dc1f7d9749c89de90097d50052714ac08aafbbb117fffac32bfb47e74779 |
30 |
DIST mariadb-10.0.36.tar.gz 66577105 BLAKE2B 6165c641cf4a8d13e53aa8391fe146edb476d6fe80aebd0c0698543595f2060a3f7c834cbfd8d7e7c50697e7be1010ae833310f2756da84b11c87224c940df50 SHA512 aa26e43775f4f76754c79c960b5e96d8ae3e28ab922d7abbb5c23867a2705085fe57830addc79eed3c810329eca344eaf1c09dcdb8b73d9d73c85090386984c0 |
31 |
-DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd |
32 |
-DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89 |
33 |
-DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76 SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e |
34 |
DIST mariadb-10.1.34.tar.gz 65298561 BLAKE2B 3f3af7b8bad68a08f69befd3f3e7bd88b8cf058feb20309dc2cdbd16bf5d015c2cb0d1d9d2fdf831f6183c0b9bb25405124c24b2940467489e05d42c57f7b0a6 SHA512 3c18359006b340dcf724d1fce36dcc19916c42492269a7545e0726172b8f7b84860e10725c74e4458dae34572395f1650bf17838e9058544e0a6cfcbffd54f6d |
35 |
DIST mariadb-10.1.35.tar.gz 65324620 BLAKE2B 659ad232a1f2f1cfd74ba8aa9b9f67adc6f4a5dc82e5d8b16011dba83155b1223138df273c935c71021f05068cd8fd14538e935847a36640fc4218b86155698c SHA512 88e6049f3bbc3aa047e108f91a2c4f335758e80f25bfa2974b5f8c2e13f5758824d7835dece021b515c531e5641b9998e4de92256ad4b47b7f694da99bd471aa |
36 |
DIST mariadb-10.2.17.tar.gz 73409162 BLAKE2B f13d359a4a061ae2ef2fb4dde53ed07dac1735f9577ef67e396a51ac74acec71acf7a0ab07b4e0f84d70c8f7bcacbdc61933957c4936c99d5038f433296af8a3 SHA512 9714f786abde43b418d8b5accbbd485de213b90db18c879625ce30777526d28fdafd3bdb43922ab6872b300cfa06895b5b3fad5eb0c0e804ad66a1fd1793a141 |
37 |
-DIST mariadb-10.3.7.tar.gz 71816160 BLAKE2B 213cfe2999b48c088e08e8289a6243d79b91e465fce51850a253a121896f69df03f935940f25ac290e15e29f97b3a16f75711044b8986f6ec3841ef8beafa0b4 SHA512 b1b3ad9ddc45bdfd3d03888ba160f9991b23187341deac402d5dc4b735511e29767a5dc64ca557bea9bf3d3b413b941ef2e1f5fa30be056dfaec4542a43895f1 |
38 |
DIST mariadb-10.3.8.tar.gz 72152953 BLAKE2B 4742be1d533c7958b61efd430411a1e7390faffc25ceccc09c736647fb263dc3797064725335abf17f9362c7a92293ea5fc72bc2ddd70636f83c25e35c4c83aa SHA512 e1b61900a06fa57992a2f8516771f5fb98799ed5a4bbe74f858c0fe87b907cc6b600942d6fe97b6064cb39b610a7213cb3bc9634a336f9ebffe11dfe67746422 |
39 |
DIST mariadb-5.5.61.tar.gz 45839038 BLAKE2B 2755963d51aee3b9b560531e00b9df6f5637c90a44ad181cf826234d27c15e9fd1b61ae4faf4d9a4ff06779e605c6a5757192407e6e402ad68dfb3ae45a94088 SHA512 a2bebb47ec62eb6cd15e003dea7708948cd96fd7f0fc631a85cfc4691b55e220ed78f3e3b16542b5152ad5bcc61e50a831c71cf8f29481f7de86816ec0bae594 |
40 |
-DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 |
41 |
-DIST mysql-extras-20180515-0123Z.tar.bz2 320380 BLAKE2B a56e3ef19f4e30628fea9889dbb55379a8c92f08c9c493fe3f524b98fabf3505150fbe7cc65f97fc8b75632b5dd7360ddb9bd1542714c5e9916f94c2792ff3db SHA512 3e0b36ab4cb3f2e7d30f1fb2d8d3a916439611f1714475f2ab0480ba51176f47dcccd40931de4bd0a46b0aca6dfcb62cfc92b6939eed2e61628947bf664008ee |
42 |
-DIST mysql-extras-20180529-0042Z.tar.bz2 321715 BLAKE2B c40e7c8de7d24f1ab6208968f3e22aae9e7782f02edef1391d37583ba4a99e67646eba2b9fdcf2a77e3e5a3a86c36632edfebb42b12ab242662cf6913313168d SHA512 a136d9f9567a3bbd396c1e33d1d7b6565be16b5b0a514835299a09b009e9d908328066701bb1c6c19af74225b1d166e3f57af81b277b6d8fad9e63c009523586 |
43 |
DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec |
44 |
|
45 |
diff --git a/dev-db/mariadb/mariadb-10.0.33.ebuild b/dev-db/mariadb/mariadb-10.0.33.ebuild |
46 |
deleted file mode 100644 |
47 |
index 4efb85756bb..00000000000 |
48 |
--- a/dev-db/mariadb/mariadb-10.0.33.ebuild |
49 |
+++ /dev/null |
50 |
@@ -1,209 +0,0 @@ |
51 |
-# Copyright 1999-2018 Gentoo Foundation |
52 |
-# Distributed under the terms of the GNU General Public License v2 |
53 |
- |
54 |
-EAPI="6" |
55 |
-MY_EXTRAS_VER="20170926-1321Z" |
56 |
-SUBSLOT="18" |
57 |
-MYSQL_PV_MAJOR="5.6" |
58 |
- |
59 |
-JAVA_PKG_OPT_USE="jdbc" |
60 |
- |
61 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
62 |
- |
63 |
-HOMEPAGE="https://mariadb.org/" |
64 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
65 |
- |
66 |
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
67 |
-RESTRICT="!bindist? ( bindist )" |
68 |
- |
69 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
70 |
- |
71 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
72 |
-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" |
73 |
- |
74 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
75 |
-PATCHES=( |
76 |
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
77 |
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch" |
78 |
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
79 |
- "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
80 |
-) |
81 |
-COMMON_DEPEND=" |
82 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
83 |
- server? ( |
84 |
- extraengine? ( |
85 |
- odbc? ( dev-db/unixODBC:0= ) |
86 |
- xml? ( dev-libs/libxml2:2= ) |
87 |
- sys-libs/zlib[minizip] |
88 |
- ) |
89 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
90 |
- pam? ( virtual/pam:0= ) |
91 |
- tokudb? ( app-arch/snappy ) |
92 |
- ) |
93 |
- >=dev-libs/libpcre-8.41-r1:3=[${MULTILIB_USEDEP}] |
94 |
-" |
95 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
96 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
97 |
- ${COMMON_DEPEND}" |
98 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
99 |
- perl? ( !dev-db/mytop |
100 |
- virtual/perl-Getopt-Long |
101 |
- dev-perl/TermReadKey |
102 |
- virtual/perl-Term-ANSIColor |
103 |
- virtual/perl-Time-HiRes ) |
104 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
105 |
-" |
106 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
107 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
108 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
109 |
- |
110 |
-pkg_setup() { |
111 |
- java-pkg-opt-2_pkg_setup |
112 |
- mysql-multilib-r1_pkg_setup |
113 |
-} |
114 |
- |
115 |
-pkg_preinst() { |
116 |
- java-pkg-opt-2_pkg_preinst |
117 |
- mysql-multilib-r1_pkg_preinst |
118 |
-} |
119 |
- |
120 |
-src_prepare() { |
121 |
- java-pkg-opt-2_src_prepare |
122 |
- mysql-multilib-r1_src_prepare |
123 |
-} |
124 |
- |
125 |
-src_configure(){ |
126 |
- # bug 508724 mariadb cannot use ld.gold |
127 |
- tc-ld-disable-gold |
128 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
129 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
130 |
- -DWITH_PCRE=system |
131 |
- ) |
132 |
- if use server ; then |
133 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
134 |
- if ! use extraengine ; then |
135 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
136 |
- -DWITHOUT_FEDERATED=1 |
137 |
- -DWITHOUT_FEDERATEDX=1 ) |
138 |
- fi |
139 |
- |
140 |
- # Connect with Zip is currently broken and does not compile |
141 |
- # Reported upstream https://jira.mariadb.org/browse/MDEV-11809 |
142 |
- |
143 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
144 |
- $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
145 |
- $(mysql-cmake_use_plugin sphinx SPHINX) |
146 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
147 |
- $(mysql-cmake_use_plugin pam AUTH_PAM) |
148 |
- $(mysql-cmake_use_plugin extraengine SEQUENCE) |
149 |
- $(mysql-cmake_use_plugin extraengine SPIDER) |
150 |
- $(mysql-cmake_use_plugin extraengine CONNECT) |
151 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
152 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
153 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
154 |
- -DWITHOUT_MROONGA=1 |
155 |
- ) |
156 |
- fi |
157 |
- mysql-multilib-r1_src_configure |
158 |
-} |
159 |
- |
160 |
-# Official test instructions: |
161 |
-# USE='extraengine perl server openssl static-libs' \ |
162 |
-# FEATURES='test userpriv -usersandbox' \ |
163 |
-# ebuild mariadb-X.X.XX.ebuild \ |
164 |
-# digest clean package |
165 |
-multilib_src_test() { |
166 |
- |
167 |
- if ! multilib_is_native_abi ; then |
168 |
- einfo "Server tests not available on non-native abi". |
169 |
- return 0; |
170 |
- fi |
171 |
- |
172 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
173 |
- local retstatus_unit |
174 |
- local retstatus_tests |
175 |
- |
176 |
- if use server ; then |
177 |
- |
178 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
179 |
- # localhost. Also causes weird failures. |
180 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
181 |
- |
182 |
- if [[ $UID -eq 0 ]]; then |
183 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
184 |
- fi |
185 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
186 |
- |
187 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
188 |
- addpredict /this-dir-does-not-exist/t9.MYI |
189 |
- |
190 |
- # Run CTest (test-units) |
191 |
- cmake-utils_src_test |
192 |
- retstatus_unit=$? |
193 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
194 |
- |
195 |
- # Ensure that parallel runs don't die |
196 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
197 |
- # Enable parallel testing, auto will try to detect number of cores |
198 |
- # You may set this by hand. |
199 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
200 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
201 |
- |
202 |
- # create directories because mysqladmin might run out of order |
203 |
- mkdir -p "${T}"/var-tests{,/log} |
204 |
- |
205 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
206 |
- # false positives: |
207 |
- # |
208 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
209 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
210 |
- # funcs_1.is_columns_mysql main.bootstrap |
211 |
- # fails due to USE=-latin1 / utf8 default |
212 |
- # |
213 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
214 |
- # main.mysql_client_test_comp: |
215 |
- # segfaults at random under Portage only, suspect resource limits. |
216 |
- # |
217 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
218 |
- # fails due to bad cleanup of previous tests when run in parallel |
219 |
- # The tool is deprecated anyway |
220 |
- # Bug 532288 |
221 |
- |
222 |
-#main.bootstrap \ |
223 |
- for t in connect.drop-open-error ; do |
224 |
-# main.mysql_client_test_comp \ |
225 |
-# binlog.binlog_statement_insert_delayed main.information_schema \ |
226 |
-# main.mysqld--help \ |
227 |
-# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
228 |
-# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
229 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
230 |
- done |
231 |
- |
232 |
- # Run mysql tests |
233 |
- pushd "${TESTDIR}" || die |
234 |
- |
235 |
- # run mysql-test tests |
236 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
237 |
- |
238 |
- retstatus_tests=$? |
239 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
240 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
241 |
- |
242 |
- popd || die |
243 |
- |
244 |
- # Cleanup is important for these testcases. |
245 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
246 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
247 |
- |
248 |
- failures="" |
249 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
250 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
251 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
252 |
- |
253 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
254 |
- einfo "Tests successfully completed" |
255 |
- |
256 |
- else |
257 |
- einfo "Skipping server tests due to minimal build." |
258 |
- fi |
259 |
-} |
260 |
|
261 |
diff --git a/dev-db/mariadb/mariadb-10.0.34.ebuild b/dev-db/mariadb/mariadb-10.0.34.ebuild |
262 |
deleted file mode 100644 |
263 |
index d1b812cfdda..00000000000 |
264 |
--- a/dev-db/mariadb/mariadb-10.0.34.ebuild |
265 |
+++ /dev/null |
266 |
@@ -1,209 +0,0 @@ |
267 |
-# Copyright 1999-2018 Gentoo Foundation |
268 |
-# Distributed under the terms of the GNU General Public License v2 |
269 |
- |
270 |
-EAPI="6" |
271 |
-MY_EXTRAS_VER="20170926-1321Z" |
272 |
-SUBSLOT="18" |
273 |
-MYSQL_PV_MAJOR="5.6" |
274 |
- |
275 |
-JAVA_PKG_OPT_USE="jdbc" |
276 |
- |
277 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
278 |
- |
279 |
-HOMEPAGE="https://mariadb.org/" |
280 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
281 |
- |
282 |
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
283 |
-RESTRICT="!bindist? ( bindist )" |
284 |
- |
285 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
286 |
- |
287 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
288 |
-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" |
289 |
- |
290 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
291 |
-PATCHES=( |
292 |
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
293 |
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch" |
294 |
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
295 |
- "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
296 |
-) |
297 |
-COMMON_DEPEND=" |
298 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
299 |
- server? ( |
300 |
- extraengine? ( |
301 |
- odbc? ( dev-db/unixODBC:0= ) |
302 |
- xml? ( dev-libs/libxml2:2= ) |
303 |
- sys-libs/zlib[minizip] |
304 |
- ) |
305 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
306 |
- pam? ( virtual/pam:0= ) |
307 |
- tokudb? ( app-arch/snappy ) |
308 |
- ) |
309 |
- >=dev-libs/libpcre-8.41-r1:3=[${MULTILIB_USEDEP}] |
310 |
-" |
311 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
312 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
313 |
- ${COMMON_DEPEND}" |
314 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
315 |
- perl? ( !dev-db/mytop |
316 |
- virtual/perl-Getopt-Long |
317 |
- dev-perl/TermReadKey |
318 |
- virtual/perl-Term-ANSIColor |
319 |
- virtual/perl-Time-HiRes ) |
320 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
321 |
-" |
322 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
323 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
324 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
325 |
- |
326 |
-pkg_setup() { |
327 |
- java-pkg-opt-2_pkg_setup |
328 |
- mysql-multilib-r1_pkg_setup |
329 |
-} |
330 |
- |
331 |
-pkg_preinst() { |
332 |
- java-pkg-opt-2_pkg_preinst |
333 |
- mysql-multilib-r1_pkg_preinst |
334 |
-} |
335 |
- |
336 |
-src_prepare() { |
337 |
- java-pkg-opt-2_src_prepare |
338 |
- mysql-multilib-r1_src_prepare |
339 |
-} |
340 |
- |
341 |
-src_configure(){ |
342 |
- # bug 508724 mariadb cannot use ld.gold |
343 |
- tc-ld-disable-gold |
344 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
345 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
346 |
- -DWITH_PCRE=system |
347 |
- ) |
348 |
- if use server ; then |
349 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
350 |
- if ! use extraengine ; then |
351 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
352 |
- -DWITHOUT_FEDERATED=1 |
353 |
- -DWITHOUT_FEDERATEDX=1 ) |
354 |
- fi |
355 |
- |
356 |
- # Connect with Zip is currently broken and does not compile |
357 |
- # Reported upstream https://jira.mariadb.org/browse/MDEV-11809 |
358 |
- |
359 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
360 |
- $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
361 |
- $(mysql-cmake_use_plugin sphinx SPHINX) |
362 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
363 |
- $(mysql-cmake_use_plugin pam AUTH_PAM) |
364 |
- $(mysql-cmake_use_plugin extraengine SEQUENCE) |
365 |
- $(mysql-cmake_use_plugin extraengine SPIDER) |
366 |
- $(mysql-cmake_use_plugin extraengine CONNECT) |
367 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
368 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
369 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
370 |
- -DWITHOUT_MROONGA=1 |
371 |
- ) |
372 |
- fi |
373 |
- mysql-multilib-r1_src_configure |
374 |
-} |
375 |
- |
376 |
-# Official test instructions: |
377 |
-# USE='extraengine perl server openssl static-libs' \ |
378 |
-# FEATURES='test userpriv -usersandbox' \ |
379 |
-# ebuild mariadb-X.X.XX.ebuild \ |
380 |
-# digest clean package |
381 |
-multilib_src_test() { |
382 |
- |
383 |
- if ! multilib_is_native_abi ; then |
384 |
- einfo "Server tests not available on non-native abi". |
385 |
- return 0; |
386 |
- fi |
387 |
- |
388 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
389 |
- local retstatus_unit |
390 |
- local retstatus_tests |
391 |
- |
392 |
- if use server ; then |
393 |
- |
394 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
395 |
- # localhost. Also causes weird failures. |
396 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
397 |
- |
398 |
- if [[ $UID -eq 0 ]]; then |
399 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
400 |
- fi |
401 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
402 |
- |
403 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
404 |
- addpredict /this-dir-does-not-exist/t9.MYI |
405 |
- |
406 |
- # Run CTest (test-units) |
407 |
- cmake-utils_src_test |
408 |
- retstatus_unit=$? |
409 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
410 |
- |
411 |
- # Ensure that parallel runs don't die |
412 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
413 |
- # Enable parallel testing, auto will try to detect number of cores |
414 |
- # You may set this by hand. |
415 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
416 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
417 |
- |
418 |
- # create directories because mysqladmin might run out of order |
419 |
- mkdir -p "${T}"/var-tests{,/log} |
420 |
- |
421 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
422 |
- # false positives: |
423 |
- # |
424 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
425 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
426 |
- # funcs_1.is_columns_mysql main.bootstrap |
427 |
- # fails due to USE=-latin1 / utf8 default |
428 |
- # |
429 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
430 |
- # main.mysql_client_test_comp: |
431 |
- # segfaults at random under Portage only, suspect resource limits. |
432 |
- # |
433 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
434 |
- # fails due to bad cleanup of previous tests when run in parallel |
435 |
- # The tool is deprecated anyway |
436 |
- # Bug 532288 |
437 |
- |
438 |
-#main.bootstrap \ |
439 |
- for t in connect.drop-open-error ; do |
440 |
-# main.mysql_client_test_comp \ |
441 |
-# binlog.binlog_statement_insert_delayed main.information_schema \ |
442 |
-# main.mysqld--help \ |
443 |
-# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
444 |
-# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
445 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
446 |
- done |
447 |
- |
448 |
- # Run mysql tests |
449 |
- pushd "${TESTDIR}" || die |
450 |
- |
451 |
- # run mysql-test tests |
452 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
453 |
- |
454 |
- retstatus_tests=$? |
455 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
456 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
457 |
- |
458 |
- popd || die |
459 |
- |
460 |
- # Cleanup is important for these testcases. |
461 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
462 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
463 |
- |
464 |
- failures="" |
465 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
466 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
467 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
468 |
- |
469 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
470 |
- einfo "Tests successfully completed" |
471 |
- |
472 |
- else |
473 |
- einfo "Skipping server tests due to minimal build." |
474 |
- fi |
475 |
-} |
476 |
|
477 |
diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild |
478 |
deleted file mode 100644 |
479 |
index df0ee3106ab..00000000000 |
480 |
--- a/dev-db/mariadb/mariadb-10.1.29.ebuild |
481 |
+++ /dev/null |
482 |
@@ -1,229 +0,0 @@ |
483 |
-# Copyright 1999-2018 Gentoo Foundation |
484 |
-# Distributed under the terms of the GNU General Public License v2 |
485 |
- |
486 |
-EAPI="6" |
487 |
-MY_EXTRAS_VER="20170926-1321Z" |
488 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
489 |
-WSREP_REVISION="25" |
490 |
-SUBSLOT="18" |
491 |
-MYSQL_PV_MAJOR="5.6" |
492 |
- |
493 |
-JAVA_PKG_OPT_USE="jdbc" |
494 |
- |
495 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
496 |
- |
497 |
-HOMEPAGE="https://mariadb.org/" |
498 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
499 |
- |
500 |
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml" |
501 |
-RESTRICT="!bindist? ( bindist )" |
502 |
- |
503 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
504 |
- |
505 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
506 |
-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" |
507 |
- |
508 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
509 |
- |
510 |
-PATCHES=( |
511 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch |
512 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
513 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
514 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
515 |
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch |
516 |
-) |
517 |
- |
518 |
-COMMON_DEPEND=" |
519 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
520 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
521 |
- !bindist? ( |
522 |
- sys-libs/binutils-libs:0= |
523 |
- >=sys-libs/readline-4.1:0= |
524 |
- ) |
525 |
- server? ( |
526 |
- backup? ( app-arch/libarchive:0= ) |
527 |
- cracklib? ( sys-libs/cracklib:0= ) |
528 |
- extraengine? ( |
529 |
- odbc? ( dev-db/unixODBC:0= ) |
530 |
- xml? ( dev-libs/libxml2:2= ) |
531 |
- sys-libs/zlib[minizip] |
532 |
- ) |
533 |
- innodb-lz4? ( app-arch/lz4 ) |
534 |
- innodb-lzo? ( dev-libs/lzo ) |
535 |
- innodb-snappy? ( app-arch/snappy ) |
536 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
537 |
- pam? ( virtual/pam:0= ) |
538 |
- systemd? ( sys-apps/systemd:= ) |
539 |
- tokudb? ( app-arch/snappy ) |
540 |
- ) |
541 |
- >=dev-libs/libpcre-8.41-r1:3= |
542 |
-" |
543 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
544 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
545 |
- ${COMMON_DEPEND}" |
546 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
547 |
- galera? ( |
548 |
- sys-apps/iproute2 |
549 |
- =sys-cluster/galera-${WSREP_REVISION}* |
550 |
- sst-rsync? ( sys-process/lsof ) |
551 |
- sst-mariabackup? ( net-misc/socat[ssl] ) |
552 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
553 |
- ) |
554 |
- perl? ( !dev-db/mytop |
555 |
- virtual/perl-Getopt-Long |
556 |
- dev-perl/TermReadKey |
557 |
- virtual/perl-Term-ANSIColor |
558 |
- virtual/perl-Time-HiRes ) |
559 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
560 |
-" |
561 |
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
562 |
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
563 |
- |
564 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
565 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
566 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
567 |
- |
568 |
-pkg_setup() { |
569 |
- java-pkg-opt-2_pkg_setup |
570 |
- mysql-multilib-r1_pkg_setup |
571 |
-} |
572 |
- |
573 |
-pkg_preinst() { |
574 |
- java-pkg-opt-2_pkg_preinst |
575 |
- mysql-multilib-r1_pkg_preinst |
576 |
-} |
577 |
- |
578 |
-src_prepare() { |
579 |
- java-pkg-opt-2_src_prepare |
580 |
- mysql-multilib-r1_src_prepare |
581 |
-} |
582 |
- |
583 |
-src_configure(){ |
584 |
- # bug 508724 mariadb cannot use ld.gold |
585 |
- tc-ld-disable-gold |
586 |
- |
587 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
588 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
589 |
- -DWITH_PCRE=system |
590 |
- ) |
591 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
592 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
593 |
- ) |
594 |
- if use server ; then |
595 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
596 |
- if ! use extraengine ; then |
597 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
598 |
- -DPLUGIN_FEDERATED=NO |
599 |
- -DPLUGIN_FEDERATEDX=NO ) |
600 |
- fi |
601 |
- |
602 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
603 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
604 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
605 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
606 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
607 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
608 |
- -DPLUGIN_CASSANDRA=NO |
609 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
610 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
611 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
612 |
- -DCONNECT_WITH_MYSQL=1 |
613 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
614 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
615 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
616 |
- -DWITH_WSREP=$(usex galera) |
617 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
618 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
619 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
620 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
621 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
622 |
- -DWITH_MARIABACKUP=$(usex backup ON OFF) |
623 |
- -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
624 |
- ) |
625 |
- fi |
626 |
- mysql-multilib-r1_src_configure |
627 |
-} |
628 |
- |
629 |
-# Official test instructions: |
630 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
631 |
-# FEATURES='test userpriv -usersandbox' \ |
632 |
-# ebuild mariadb-X.X.XX.ebuild \ |
633 |
-# digest clean package |
634 |
-multilib_src_test() { |
635 |
- |
636 |
- if ! multilib_is_native_abi ; then |
637 |
- einfo "Server tests not available on non-native abi". |
638 |
- return 0; |
639 |
- fi |
640 |
- |
641 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
642 |
- local retstatus_unit |
643 |
- local retstatus_tests |
644 |
- |
645 |
- if ! use server ; then |
646 |
- einfo "Skipping server tests due to minimal build." |
647 |
- return 0 |
648 |
- fi |
649 |
- |
650 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
651 |
- # localhost. Also causes weird failures. |
652 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
653 |
- |
654 |
- if [[ $UID -eq 0 ]]; then |
655 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
656 |
- fi |
657 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
658 |
- |
659 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
660 |
- |
661 |
- # Run CTest (test-units) |
662 |
- cmake-utils_src_test |
663 |
- retstatus_unit=$? |
664 |
- |
665 |
- # Ensure that parallel runs don't die |
666 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
667 |
- # Enable parallel testing, auto will try to detect number of cores |
668 |
- # You may set this by hand. |
669 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
670 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
671 |
- |
672 |
- # create directories because mysqladmin might run out of order |
673 |
- mkdir -p "${T}"/var-tests{,/log} |
674 |
- |
675 |
- # Run mysql tests |
676 |
- pushd "${TESTDIR}" || die |
677 |
- |
678 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
679 |
- # false positives: |
680 |
- # |
681 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
682 |
- # main.mysql_client_test_comp: |
683 |
- # segfaults at random under Portage only, suspect resource limits. |
684 |
- |
685 |
- local t |
686 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
687 |
- mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" |
688 |
- done |
689 |
- |
690 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
691 |
- main.mysql_client_test_comp ; do |
692 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
693 |
- done |
694 |
- |
695 |
- # run mysql-test tests |
696 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
697 |
- retstatus_tests=$? |
698 |
- |
699 |
- popd || die |
700 |
- |
701 |
- # Cleanup is important for these testcases. |
702 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
703 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
704 |
- |
705 |
- local failures="" |
706 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
707 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
708 |
- |
709 |
- [[ -z "$failures" ]] || eerror "Test failures: $failures" |
710 |
- einfo "Tests successfully completed" |
711 |
-} |
712 |
|
713 |
diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild |
714 |
deleted file mode 100644 |
715 |
index e64c339ee6e..00000000000 |
716 |
--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild |
717 |
+++ /dev/null |
718 |
@@ -1,244 +0,0 @@ |
719 |
-# Copyright 1999-2018 Gentoo Foundation |
720 |
-# Distributed under the terms of the GNU General Public License v2 |
721 |
- |
722 |
-EAPI="6" |
723 |
-MY_EXTRAS_VER="20180515-0123Z" |
724 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
725 |
-WSREP_REVISION="25" |
726 |
-SUBSLOT="18" |
727 |
-MYSQL_PV_MAJOR="5.6" |
728 |
- |
729 |
-JAVA_PKG_OPT_USE="jdbc" |
730 |
- |
731 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
732 |
- |
733 |
-HOMEPAGE="https://mariadb.org/" |
734 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
735 |
- |
736 |
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml" |
737 |
-RESTRICT="!bindist? ( bindist )" |
738 |
- |
739 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
740 |
- |
741 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
742 |
-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" |
743 |
- |
744 |
-MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" |
745 |
- |
746 |
-PATCHES=( |
747 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch |
748 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
749 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
750 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
751 |
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch |
752 |
- "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch |
753 |
- "${MY_PATCH_DIR}"/20033_all_mariadb-10.1.31-xtradb-sst.patch |
754 |
- "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch |
755 |
-) |
756 |
- |
757 |
-COMMON_DEPEND=" |
758 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
759 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
760 |
- !bindist? ( |
761 |
- sys-libs/binutils-libs:0= |
762 |
- >=sys-libs/readline-4.1:0= |
763 |
- ) |
764 |
- server? ( |
765 |
- backup? ( app-arch/libarchive:0= ) |
766 |
- cracklib? ( sys-libs/cracklib:0= ) |
767 |
- extraengine? ( |
768 |
- odbc? ( dev-db/unixODBC:0= ) |
769 |
- xml? ( dev-libs/libxml2:2= ) |
770 |
- sys-libs/zlib[minizip] |
771 |
- ) |
772 |
- innodb-lz4? ( app-arch/lz4 ) |
773 |
- innodb-lzo? ( dev-libs/lzo ) |
774 |
- innodb-snappy? ( app-arch/snappy ) |
775 |
- numa? ( sys-process/numactl ) |
776 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
777 |
- pam? ( virtual/pam:0= ) |
778 |
- systemd? ( sys-apps/systemd:= ) |
779 |
- tokudb? ( app-arch/snappy ) |
780 |
- ) |
781 |
- >=dev-libs/libpcre-8.41-r1:3= |
782 |
-" |
783 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
784 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
785 |
- ${COMMON_DEPEND}" |
786 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
787 |
- galera? ( |
788 |
- sys-apps/iproute2 |
789 |
- =sys-cluster/galera-${WSREP_REVISION}* |
790 |
- sst-rsync? ( sys-process/lsof ) |
791 |
- sst-mariabackup? ( net-misc/socat[ssl] ) |
792 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
793 |
- ) |
794 |
- perl? ( !dev-db/mytop |
795 |
- virtual/perl-Getopt-Long |
796 |
- dev-perl/TermReadKey |
797 |
- virtual/perl-Term-ANSIColor |
798 |
- virtual/perl-Time-HiRes ) |
799 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
800 |
-" |
801 |
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
802 |
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
803 |
- |
804 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
805 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
806 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
807 |
- |
808 |
-pkg_setup() { |
809 |
- java-pkg-opt-2_pkg_setup |
810 |
- mysql-multilib-r1_pkg_setup |
811 |
-} |
812 |
- |
813 |
-pkg_preinst() { |
814 |
- java-pkg-opt-2_pkg_preinst |
815 |
- mysql-multilib-r1_pkg_preinst |
816 |
-} |
817 |
- |
818 |
-src_prepare() { |
819 |
- java-pkg-opt-2_src_prepare |
820 |
- mysql-multilib-r1_src_prepare |
821 |
-} |
822 |
- |
823 |
-src_configure(){ |
824 |
- # bug 508724 mariadb cannot use ld.gold |
825 |
- tc-ld-disable-gold |
826 |
- |
827 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
828 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
829 |
- -DWITH_PCRE=system |
830 |
- ) |
831 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
832 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
833 |
- ) |
834 |
- if use server ; then |
835 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
836 |
- if ! use extraengine ; then |
837 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
838 |
- -DPLUGIN_FEDERATED=NO |
839 |
- -DPLUGIN_FEDERATEDX=NO ) |
840 |
- fi |
841 |
- |
842 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
843 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
844 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
845 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
846 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
847 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
848 |
- -DPLUGIN_CASSANDRA=NO |
849 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
850 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
851 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
852 |
- -DCONNECT_WITH_MYSQL=1 |
853 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
854 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
855 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
856 |
- # Build failure and autodep wrt bug 639144 |
857 |
- -DCONNECT_WITH_MONGO=OFF |
858 |
- -DWITH_WSREP=$(usex galera) |
859 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
860 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
861 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
862 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
863 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
864 |
- -DWITH_MARIABACKUP=$(usex backup ON OFF) |
865 |
- -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
866 |
- -DWITH_NUMA=$(usex numa ON OFF) |
867 |
- ) |
868 |
- fi |
869 |
- mysql-multilib-r1_src_configure |
870 |
-} |
871 |
- |
872 |
-# Official test instructions: |
873 |
-# USE='extraengine perl server openssl static-libs' \ |
874 |
-# FEATURES='test userpriv -usersandbox' \ |
875 |
-# ebuild mariadb-X.X.XX.ebuild \ |
876 |
-# digest clean package |
877 |
-multilib_src_test() { |
878 |
- |
879 |
- if ! multilib_is_native_abi ; then |
880 |
- einfo "Server tests not available on non-native abi". |
881 |
- return 0; |
882 |
- fi |
883 |
- |
884 |
- _disable_test() { |
885 |
- local rawtestname reason |
886 |
- rawtestname="${1}" ; shift |
887 |
- reason="${@}" |
888 |
- ewarn "test '${rawtestname}' disabled: '${reason}'" |
889 |
- echo ${rawtestname} : ${reason} >> "${T}/disabled.def" |
890 |
- } |
891 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
892 |
- local retstatus_unit |
893 |
- local retstatus_tests |
894 |
- |
895 |
- if ! use server ; then |
896 |
- einfo "Skipping server tests due to minimal build." |
897 |
- return 0 |
898 |
- fi |
899 |
- |
900 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
901 |
- # localhost. Also causes weird failures. |
902 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
903 |
- |
904 |
- if [[ $UID -eq 0 ]]; then |
905 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
906 |
- fi |
907 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
908 |
- |
909 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
910 |
- |
911 |
- # Run CTest (test-units) |
912 |
- cmake-utils_src_test |
913 |
- retstatus_unit=$? |
914 |
- |
915 |
- # Ensure that parallel runs don't die |
916 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
917 |
- # Enable parallel testing, auto will try to detect number of cores |
918 |
- # You may set this by hand. |
919 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
920 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
921 |
- |
922 |
- # create directories because mysqladmin might run out of order |
923 |
- mkdir -p "${T}"/var-tests{,/log} |
924 |
- |
925 |
- # Run mysql tests |
926 |
- pushd "${TESTDIR}" || die |
927 |
- |
928 |
- touch "${T}/disabled.def" |
929 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
930 |
- # false positives: |
931 |
- # |
932 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
933 |
- # main.mysql_client_test_comp: |
934 |
- # segfaults at random under Portage only, suspect resource limits. |
935 |
- |
936 |
- local t |
937 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
938 |
- _disable_test "$t" "False positive due to varying policies" |
939 |
- done |
940 |
- |
941 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
942 |
- main.mysql_client_test_comp ; do |
943 |
- _disable_test "$t" "False positives in Gentoo" |
944 |
- done |
945 |
- |
946 |
- # run mysql-test tests |
947 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def" |
948 |
- retstatus_tests=$? |
949 |
- |
950 |
- popd || die |
951 |
- |
952 |
- # Cleanup is important for these testcases. |
953 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
954 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
955 |
- |
956 |
- local failures="" |
957 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
958 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
959 |
- |
960 |
- [[ -z "$failures" ]] || eerror "Test failures: $failures" |
961 |
- einfo "Tests successfully completed" |
962 |
-} |
963 |
|
964 |
diff --git a/dev-db/mariadb/mariadb-10.1.33.ebuild b/dev-db/mariadb/mariadb-10.1.33.ebuild |
965 |
deleted file mode 100644 |
966 |
index e9a050b1fbd..00000000000 |
967 |
--- a/dev-db/mariadb/mariadb-10.1.33.ebuild |
968 |
+++ /dev/null |
969 |
@@ -1,248 +0,0 @@ |
970 |
-# Copyright 1999-2018 Gentoo Foundation |
971 |
-# Distributed under the terms of the GNU General Public License v2 |
972 |
- |
973 |
-EAPI="6" |
974 |
-MY_EXTRAS_VER="20180515-0123Z" |
975 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
976 |
-WSREP_REVISION="25" |
977 |
-SUBSLOT="18" |
978 |
-MYSQL_PV_MAJOR="5.6" |
979 |
- |
980 |
-JAVA_PKG_OPT_USE="jdbc" |
981 |
- |
982 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
983 |
- |
984 |
-HOMEPAGE="https://mariadb.org/" |
985 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
986 |
- |
987 |
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml" |
988 |
-RESTRICT="!bindist? ( bindist )" |
989 |
- |
990 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
991 |
- |
992 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
993 |
-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" |
994 |
- |
995 |
-if [[ ${MY_EXTRAS_VER} == "live" ]] ; then |
996 |
- MY_PATCH_DIR="${WORKDIR%/}/mysql-extras" |
997 |
-else |
998 |
- MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" |
999 |
-fi |
1000 |
- |
1001 |
-PATCHES=( |
1002 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch |
1003 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
1004 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
1005 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
1006 |
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch |
1007 |
- "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch |
1008 |
- "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch |
1009 |
-) |
1010 |
- |
1011 |
-COMMON_DEPEND=" |
1012 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
1013 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
1014 |
- !bindist? ( |
1015 |
- sys-libs/binutils-libs:0= |
1016 |
- >=sys-libs/readline-4.1:0= |
1017 |
- ) |
1018 |
- server? ( |
1019 |
- backup? ( app-arch/libarchive:0= ) |
1020 |
- cracklib? ( sys-libs/cracklib:0= ) |
1021 |
- extraengine? ( |
1022 |
- odbc? ( dev-db/unixODBC:0= ) |
1023 |
- xml? ( dev-libs/libxml2:2= ) |
1024 |
- sys-libs/zlib[minizip] |
1025 |
- ) |
1026 |
- innodb-lz4? ( app-arch/lz4 ) |
1027 |
- innodb-lzo? ( dev-libs/lzo ) |
1028 |
- innodb-snappy? ( app-arch/snappy ) |
1029 |
- numa? ( sys-process/numactl ) |
1030 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
1031 |
- pam? ( virtual/pam:0= ) |
1032 |
- systemd? ( sys-apps/systemd:= ) |
1033 |
- tokudb? ( app-arch/snappy ) |
1034 |
- ) |
1035 |
- >=dev-libs/libpcre-8.41-r1:3= |
1036 |
- openssl? ( !>=dev-libs/openssl-1.1.0 ) |
1037 |
-" |
1038 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
1039 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
1040 |
- ${COMMON_DEPEND}" |
1041 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
1042 |
- galera? ( |
1043 |
- sys-apps/iproute2 |
1044 |
- =sys-cluster/galera-${WSREP_REVISION}* |
1045 |
- sst-rsync? ( sys-process/lsof ) |
1046 |
- sst-mariabackup? ( net-misc/socat[ssl] ) |
1047 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
1048 |
- ) |
1049 |
- perl? ( !dev-db/mytop |
1050 |
- virtual/perl-Getopt-Long |
1051 |
- dev-perl/TermReadKey |
1052 |
- virtual/perl-Term-ANSIColor |
1053 |
- virtual/perl-Time-HiRes ) |
1054 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
1055 |
-" |
1056 |
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
1057 |
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
1058 |
- |
1059 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
1060 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
1061 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
1062 |
- |
1063 |
-pkg_setup() { |
1064 |
- java-pkg-opt-2_pkg_setup |
1065 |
- mysql-multilib-r1_pkg_setup |
1066 |
-} |
1067 |
- |
1068 |
-pkg_preinst() { |
1069 |
- java-pkg-opt-2_pkg_preinst |
1070 |
- mysql-multilib-r1_pkg_preinst |
1071 |
-} |
1072 |
- |
1073 |
-src_prepare() { |
1074 |
- java-pkg-opt-2_src_prepare |
1075 |
- mysql-multilib-r1_src_prepare |
1076 |
-} |
1077 |
- |
1078 |
-src_configure(){ |
1079 |
- # bug 508724 mariadb cannot use ld.gold |
1080 |
- tc-ld-disable-gold |
1081 |
- |
1082 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
1083 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
1084 |
- -DWITH_PCRE=system |
1085 |
- ) |
1086 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
1087 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
1088 |
- ) |
1089 |
- if use server ; then |
1090 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
1091 |
- if ! use extraengine ; then |
1092 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
1093 |
- -DPLUGIN_FEDERATED=NO |
1094 |
- -DPLUGIN_FEDERATEDX=NO ) |
1095 |
- fi |
1096 |
- |
1097 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
1098 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
1099 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
1100 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
1101 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
1102 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
1103 |
- -DPLUGIN_CASSANDRA=NO |
1104 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
1105 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
1106 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
1107 |
- -DCONNECT_WITH_MYSQL=1 |
1108 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
1109 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
1110 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
1111 |
- # Build failure and autodep wrt bug 639144 |
1112 |
- -DCONNECT_WITH_MONGO=OFF |
1113 |
- -DWITH_WSREP=$(usex galera) |
1114 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
1115 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
1116 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
1117 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
1118 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
1119 |
- -DWITH_MARIABACKUP=$(usex backup ON OFF) |
1120 |
- -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
1121 |
- -DWITH_NUMA=$(usex numa ON OFF) |
1122 |
- ) |
1123 |
- fi |
1124 |
- mysql-multilib-r1_src_configure |
1125 |
-} |
1126 |
- |
1127 |
-# Official test instructions: |
1128 |
-# USE='extraengine perl server openssl static-libs' \ |
1129 |
-# FEATURES='test userpriv -usersandbox' \ |
1130 |
-# ebuild mariadb-X.X.XX.ebuild \ |
1131 |
-# digest clean package |
1132 |
-multilib_src_test() { |
1133 |
- |
1134 |
- if ! multilib_is_native_abi ; then |
1135 |
- einfo "Server tests not available on non-native abi". |
1136 |
- return 0; |
1137 |
- fi |
1138 |
- |
1139 |
- _disable_test() { |
1140 |
- local rawtestname reason |
1141 |
- rawtestname="${1}" ; shift |
1142 |
- reason="${@}" |
1143 |
- ewarn "test '${rawtestname}' disabled: '${reason}'" |
1144 |
- echo ${rawtestname} : ${reason} >> "${T}/disabled.def" |
1145 |
- } |
1146 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
1147 |
- local retstatus_unit |
1148 |
- local retstatus_tests |
1149 |
- |
1150 |
- if ! use server ; then |
1151 |
- einfo "Skipping server tests due to minimal build." |
1152 |
- return 0 |
1153 |
- fi |
1154 |
- |
1155 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
1156 |
- # localhost. Also causes weird failures. |
1157 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
1158 |
- |
1159 |
- if [[ $UID -eq 0 ]]; then |
1160 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
1161 |
- fi |
1162 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
1163 |
- |
1164 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
1165 |
- |
1166 |
- # Run CTest (test-units) |
1167 |
- cmake-utils_src_test |
1168 |
- retstatus_unit=$? |
1169 |
- |
1170 |
- # Ensure that parallel runs don't die |
1171 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
1172 |
- # Enable parallel testing, auto will try to detect number of cores |
1173 |
- # You may set this by hand. |
1174 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
1175 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
1176 |
- |
1177 |
- # create directories because mysqladmin might run out of order |
1178 |
- mkdir -p "${T}"/var-tests{,/log} |
1179 |
- |
1180 |
- # Run mysql tests |
1181 |
- pushd "${TESTDIR}" || die |
1182 |
- |
1183 |
- touch "${T}/disabled.def" |
1184 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
1185 |
- # false positives: |
1186 |
- # |
1187 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
1188 |
- # main.mysql_client_test_comp: |
1189 |
- # segfaults at random under Portage only, suspect resource limits. |
1190 |
- |
1191 |
- local t |
1192 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
1193 |
- _disable_test "$t" "False positive due to varying policies" |
1194 |
- done |
1195 |
- |
1196 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
1197 |
- main.mysql_client_test_comp ; do |
1198 |
- _disable_test "$t" "False positives in Gentoo" |
1199 |
- done |
1200 |
- |
1201 |
- # run mysql-test tests |
1202 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def" |
1203 |
- retstatus_tests=$? |
1204 |
- |
1205 |
- popd || die |
1206 |
- |
1207 |
- # Cleanup is important for these testcases. |
1208 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
1209 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
1210 |
- |
1211 |
- local failures="" |
1212 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
1213 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
1214 |
- |
1215 |
- [[ -z "$failures" ]] || eerror "Test failures: $failures" |
1216 |
- einfo "Tests successfully completed" |
1217 |
-} |
1218 |
|
1219 |
diff --git a/dev-db/mariadb/mariadb-10.3.7.ebuild b/dev-db/mariadb/mariadb-10.3.7.ebuild |
1220 |
deleted file mode 100644 |
1221 |
index 2f13d576085..00000000000 |
1222 |
--- a/dev-db/mariadb/mariadb-10.3.7.ebuild |
1223 |
+++ /dev/null |
1224 |
@@ -1,960 +0,0 @@ |
1225 |
-# Copyright 1999-2018 Gentoo Foundation |
1226 |
-# Distributed under the terms of the GNU General Public License v2 |
1227 |
- |
1228 |
-EAPI="6" |
1229 |
-MY_EXTRAS_VER="20180529-0042Z" |
1230 |
-SUBSLOT="18" |
1231 |
- |
1232 |
-JAVA_PKG_OPT_USE="jdbc" |
1233 |
- |
1234 |
-# Keeping eutils in EAPI=6 for emktemp in pkg_config |
1235 |
- |
1236 |
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \ |
1237 |
- java-pkg-opt-2 user cmake-utils multilib-build |
1238 |
- |
1239 |
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz " |
1240 |
- |
1241 |
-# Gentoo patches to MySQL |
1242 |
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then |
1243 |
- SRC_URI="${SRC_URI} |
1244 |
- mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
1245 |
- https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
1246 |
- https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
1247 |
- https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
1248 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" |
1249 |
-fi |
1250 |
- |
1251 |
-HOMEPAGE="https://mariadb.org/" |
1252 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
1253 |
-LICENSE="GPL-2 LGPL-2.1+" |
1254 |
-SLOT="0/${SUBSLOT:-0}" |
1255 |
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 |
1256 |
- innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga |
1257 |
- numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx |
1258 |
- sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc |
1259 |
- test tokudb xml yassl" |
1260 |
- |
1261 |
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
1262 |
-RESTRICT="!bindist? ( bindist ) libressl? ( test )" |
1263 |
- |
1264 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) |
1265 |
- server? ( tokudb? ( jemalloc !tcmalloc ) ) |
1266 |
- ?? ( tcmalloc jemalloc ) |
1267 |
- static? ( yassl !pam )" |
1268 |
- |
1269 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
1270 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
1271 |
- |
1272 |
-# Shorten the path because the socket path length must be shorter than 107 chars |
1273 |
-# and we will run a mysql server during test phase |
1274 |
-S="${WORKDIR}/mysql" |
1275 |
- |
1276 |
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then |
1277 |
- inherit git-r3 |
1278 |
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git" |
1279 |
- EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras" |
1280 |
- EGIT_CLONE_TYPE=shallow |
1281 |
- MY_PATCH_DIR="${WORKDIR%/}/mysql-extras" |
1282 |
-else |
1283 |
- MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" |
1284 |
-fi |
1285 |
- |
1286 |
-PATCHES=( |
1287 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
1288 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
1289 |
- "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch |
1290 |
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch |
1291 |
- "${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch |
1292 |
-) |
1293 |
- |
1294 |
-# Be warned, *DEPEND are version-dependant |
1295 |
-# These are used for both runtime and compiletime |
1296 |
-# MULTILIB_USEDEP only set for libraries used by the client library |
1297 |
-COMMON_DEPEND=" |
1298 |
- kernel_linux? ( |
1299 |
- sys-process/procps:0= |
1300 |
- dev-libs/libaio:0= |
1301 |
- ) |
1302 |
- >=sys-apps/sed-4 |
1303 |
- >=sys-apps/texinfo-4.7-r1 |
1304 |
- jemalloc? ( dev-libs/jemalloc:0= ) |
1305 |
- tcmalloc? ( dev-util/google-perftools:0= ) |
1306 |
- systemtap? ( >=dev-util/systemtap-1.3:0= ) |
1307 |
- >=sys-libs/zlib-1.2.3:0= |
1308 |
- kerberos? ( virtual/krb5 ) |
1309 |
- yassl? ( net-libs/gnutls:0= ) |
1310 |
- !yassl? ( |
1311 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
1312 |
- libressl? ( dev-libs/libressl:0= ) |
1313 |
- ) |
1314 |
- sys-libs/ncurses:0= |
1315 |
- !bindist? ( |
1316 |
- sys-libs/binutils-libs:0= |
1317 |
- >=sys-libs/readline-4.1:0= |
1318 |
- ) |
1319 |
- server? ( |
1320 |
- backup? ( app-arch/libarchive:0= ) |
1321 |
- cracklib? ( sys-libs/cracklib:0= ) |
1322 |
- extraengine? ( |
1323 |
- odbc? ( dev-db/unixODBC:0= ) |
1324 |
- xml? ( dev-libs/libxml2:2= ) |
1325 |
- ) |
1326 |
- innodb-lz4? ( app-arch/lz4 ) |
1327 |
- innodb-lzo? ( dev-libs/lzo ) |
1328 |
- innodb-snappy? ( app-arch/snappy ) |
1329 |
- mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) |
1330 |
- numa? ( sys-process/numactl ) |
1331 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
1332 |
- pam? ( virtual/pam:0= ) |
1333 |
- systemd? ( sys-apps/systemd:= ) |
1334 |
- tokudb? ( app-arch/snappy ) |
1335 |
- ) |
1336 |
- >=dev-libs/libpcre-8.41-r1:3= |
1337 |
- dev-db/mariadb-connector-c[${MULTILIB_USEDEP},static-libs?] dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] |
1338 |
-" |
1339 |
-DEPEND="virtual/yacc |
1340 |
- static? ( sys-libs/ncurses[static-libs] ) |
1341 |
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
1342 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
1343 |
- ${COMMON_DEPEND}" |
1344 |
-RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
1345 |
- !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster |
1346 |
- server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
1347 |
- !<virtual/mysql-5.6-r11 |
1348 |
- ${COMMON_DEPEND} |
1349 |
- server? ( galera? ( |
1350 |
- sys-apps/iproute2 |
1351 |
- =sys-cluster/galera-25* |
1352 |
- sst-rsync? ( sys-process/lsof ) |
1353 |
- sst-mariabackup? ( net-misc/socat[ssl] ) |
1354 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
1355 |
- ) ) |
1356 |
- perl? ( !dev-db/mytop |
1357 |
- virtual/perl-Getopt-Long |
1358 |
- dev-perl/TermReadKey |
1359 |
- virtual/perl-Term-ANSIColor |
1360 |
- virtual/perl-Time-HiRes ) |
1361 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
1362 |
-" |
1363 |
-# For other stuff to bring us in |
1364 |
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
1365 |
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
1366 |
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
1367 |
- server? ( ~virtual/mysql-5.6[static=] |
1368 |
- galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" |
1369 |
- |
1370 |
-pkg_setup() { |
1371 |
- if [[ ${MERGE_TYPE} != binary ]] ; then |
1372 |
- local GCC_MAJOR_SET=$(gcc-major-version) |
1373 |
- local GCC_MINOR_SET=$(gcc-minor-version) |
1374 |
- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ |
1375 |
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then |
1376 |
- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." |
1377 |
- eerror "Please use gcc-config to switch to gcc-4.7 or later version." |
1378 |
- die |
1379 |
- fi |
1380 |
- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on |
1381 |
- # non x86{,_64} arches |
1382 |
- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ |
1383 |
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then |
1384 |
- eerror "${PN} needs to be built with gcc-4.7 or later." |
1385 |
- eerror "Please use gcc-config to switch to gcc-4.7 or later version." |
1386 |
- die |
1387 |
- fi |
1388 |
- fi |
1389 |
- java-pkg-opt-2_pkg_setup |
1390 |
- if has test ${FEATURES} && \ |
1391 |
- use server && ! has userpriv ${FEATURES} ; then |
1392 |
- eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
1393 |
- fi |
1394 |
- |
1395 |
- # This should come after all of the die statements |
1396 |
- enewgroup mysql 60 || die "problem adding 'mysql' group" |
1397 |
- enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" |
1398 |
-} |
1399 |
- |
1400 |
-pkg_preinst() { |
1401 |
- java-pkg-opt-2_pkg_preinst |
1402 |
- |
1403 |
- # Here we need to see if the implementation switched client libraries |
1404 |
- # We check if this is a new instance of the package and a client library already exists |
1405 |
- local SHOW_ABI_MESSAGE libpath |
1406 |
- if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then |
1407 |
- libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so") |
1408 |
- elog "Due to ABI changes when switching between different client libraries," |
1409 |
- elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." |
1410 |
- elog "Please run: revdep-rebuild --library ${libpath}" |
1411 |
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" |
1412 |
- fi |
1413 |
-} |
1414 |
- |
1415 |
-pkg_postinst() { |
1416 |
- # Make sure the vars are correctly initialized |
1417 |
- mysql_init_vars |
1418 |
- |
1419 |
- # Create log directory securely if it does not exist |
1420 |
- [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" |
1421 |
- |
1422 |
- if use server ; then |
1423 |
- if use pam; then |
1424 |
- einfo |
1425 |
- elog "This install includes the PAM authentication plugin." |
1426 |
- elog "To activate and configure the PAM plugin, please read:" |
1427 |
- elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" |
1428 |
- einfo |
1429 |
- fi |
1430 |
- |
1431 |
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then |
1432 |
- einfo |
1433 |
- elog "You might want to run:" |
1434 |
- elog "\"emerge --config =${CATEGORY}/${PF}\"" |
1435 |
- elog "if this is a new install." |
1436 |
- elog |
1437 |
- elog "If you are switching server implentations, you should run the" |
1438 |
- elog "mysql_upgrade tool." |
1439 |
- einfo |
1440 |
- else |
1441 |
- einfo |
1442 |
- elog "If you are upgrading major versions, you should run the" |
1443 |
- elog "mysql_upgrade tool." |
1444 |
- einfo |
1445 |
- fi |
1446 |
- |
1447 |
- if use galera ; then |
1448 |
- einfo |
1449 |
- elog "Be sure to edit the my.cnf file to activate your cluster settings." |
1450 |
- elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" |
1451 |
- elog "The first time the cluster is activated, you should add" |
1452 |
- elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." |
1453 |
- elog "This option should then be removed for subsequent starts." |
1454 |
- einfo |
1455 |
- fi |
1456 |
- fi |
1457 |
- |
1458 |
- # Note about configuration change |
1459 |
- einfo |
1460 |
- elog "This version of mariadb reorganizes the configuration from a single my.cnf" |
1461 |
- elog "to several files in /etc/mysql/${PN}.d." |
1462 |
- elog "Please backup any changes you made to /etc/mysql/my.cnf" |
1463 |
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension." |
1464 |
- elog "You may have as many files as needed and they are read alphabetically." |
1465 |
- elog "Be sure the options have the appropitate section headers, i.e. [mysqld]." |
1466 |
- einfo |
1467 |
-} |
1468 |
- |
1469 |
-src_unpack() { |
1470 |
- |
1471 |
- # Initialize the proper variables first |
1472 |
- mysql_init_vars |
1473 |
- |
1474 |
- unpack ${A} |
1475 |
- # Grab the patches |
1476 |
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack |
1477 |
- |
1478 |
- mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die |
1479 |
-} |
1480 |
- |
1481 |
-src_prepare() { |
1482 |
- _disable_plugin() { |
1483 |
- echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die |
1484 |
- } |
1485 |
- _disable_engine() { |
1486 |
- echo > "${S%/}/storage/${1}/CMakeLists.txt" || die |
1487 |
- } |
1488 |
- |
1489 |
- java-pkg-opt-2_src_prepare |
1490 |
- if use tcmalloc; then |
1491 |
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" |
1492 |
- fi |
1493 |
- |
1494 |
- # Don't build bundled xz-utils for tokudb |
1495 |
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die |
1496 |
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die |
1497 |
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die |
1498 |
- |
1499 |
- local plugin |
1500 |
- local server_plugins=( handler_socket auth_socket feedback metadata_lock_info |
1501 |
- locale_info qc_info server_audit sql_errlog ) |
1502 |
- local test_plugins=( audit_null auth_examples daemon_example fulltext |
1503 |
- debug_key_management example_key_management versioning ) |
1504 |
- if ! use server; then # These plugins are for the server |
1505 |
- for plugin in "${server_plugins[@]}" ; do |
1506 |
- _disable_plugin "${plugin}" |
1507 |
- done |
1508 |
- fi |
1509 |
- |
1510 |
- if ! use test; then # These plugins are only used during testing |
1511 |
- for plugin in "${test_plugins[@]}" ; do |
1512 |
- _disable_plugin "${plugin}" |
1513 |
- done |
1514 |
- _disable_engine test_sql_discovery |
1515 |
- fi |
1516 |
- |
1517 |
- _disable_engine example |
1518 |
- |
1519 |
- if ! use oqgraph ; then # avoids extra library checks |
1520 |
- _disable_engine oqgraph |
1521 |
- fi |
1522 |
- |
1523 |
- if use mroonga ; then |
1524 |
- # Remove the bundled groonga |
1525 |
- # There is no CMake flag, it simply checks for existance |
1526 |
- rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" |
1527 |
- else |
1528 |
- _disable_engine mroonga |
1529 |
- fi |
1530 |
- |
1531 |
- cmake-utils_src_prepare |
1532 |
-} |
1533 |
- |
1534 |
-src_configure(){ |
1535 |
- # bug 508724 mariadb cannot use ld.gold |
1536 |
- tc-ld-disable-gold |
1537 |
- # Bug #114895, bug #110149 |
1538 |
- filter-flags "-O" "-O[01]" |
1539 |
- |
1540 |
- append-cxxflags -felide-constructors |
1541 |
- |
1542 |
- # bug #283926, with GCC4.4, this is required to get correct behavior. |
1543 |
- append-flags -fno-strict-aliasing |
1544 |
- |
1545 |
- CMAKE_BUILD_TYPE="RelWithDebInfo" |
1546 |
- |
1547 |
- # debug hack wrt #497532 |
1548 |
- mycmakeargs=( |
1549 |
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" |
1550 |
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" |
1551 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
1552 |
- -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" |
1553 |
- -DSYSCONFDIR="${EPREFIX}/etc/mysql" |
1554 |
- -DINSTALL_BINDIR=bin |
1555 |
- -DINSTALL_DOCDIR=share/doc/${PF} |
1556 |
- -DINSTALL_DOCREADMEDIR=share/doc/${PF} |
1557 |
- -DINSTALL_INCLUDEDIR=include/mysql |
1558 |
- -DINSTALL_INFODIR=share/info |
1559 |
- -DINSTALL_LIBDIR=$(get_libdir) |
1560 |
- -DINSTALL_MANDIR=share/man |
1561 |
- -DINSTALL_MYSQLSHAREDIR=share/mariadb |
1562 |
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin |
1563 |
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts |
1564 |
- -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" |
1565 |
- -DINSTALL_SBINDIR=sbin |
1566 |
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" |
1567 |
- -DWITH_COMMENT="Gentoo Linux ${PF}" |
1568 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
1569 |
- -DWITH_LIBEDIT=0 |
1570 |
- -DWITH_ZLIB=system |
1571 |
- -DWITHOUT_LIBWRAP=1 |
1572 |
- -DENABLED_LOCAL_INFILE=1 |
1573 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
1574 |
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
1575 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=0 |
1576 |
- -DWITH_DEFAULT_FEATURE_SET=0 |
1577 |
- -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" |
1578 |
- # The build forces this to be defined when cross-compiling. We pass it |
1579 |
- # all the time for simplicity and to make sure it is actually correct. |
1580 |
- -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) |
1581 |
- -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)" |
1582 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) |
1583 |
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF) |
1584 |
- -DCONC_WITH_EXTERNAL_ZLIB=YES |
1585 |
- -DWITH_EXTERNAL_ZLIB=YES |
1586 |
- -DSUFFIX_INSTALL_DIR="" |
1587 |
- -DWITH_UNITTEST=OFF |
1588 |
- -DWITHOUT_CLIENTLIBS=YES |
1589 |
- -DCLIENT_PLUGIN_DIALOG=OFF |
1590 |
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF |
1591 |
- -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC |
1592 |
- ) |
1593 |
- if use test ; then |
1594 |
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test ) |
1595 |
- else |
1596 |
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) |
1597 |
- fi |
1598 |
- |
1599 |
- if ! use yassl ; then |
1600 |
- mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC ) |
1601 |
- else |
1602 |
- mycmakeargs+=( -DWITH_SSL=bundled ) |
1603 |
- fi |
1604 |
- |
1605 |
- # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION |
1606 |
- mycmakeargs+=( |
1607 |
- -DWITH_READLINE=$(usex bindist 1 0) |
1608 |
- -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
1609 |
- -DENABLE_DTRACE=$(usex systemtap) |
1610 |
- ) |
1611 |
- |
1612 |
- if use server ; then |
1613 |
- |
1614 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
1615 |
- if ! use extraengine ; then |
1616 |
- mycmakeargs+=( |
1617 |
- -DPLUGIN_FEDERATED=NO |
1618 |
- -DPLUGIN_FEDERATEDX=NO ) |
1619 |
- fi |
1620 |
- |
1621 |
- mycmakeargs+=( |
1622 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
1623 |
- -DWITH_PCRE=system |
1624 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) |
1625 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
1626 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
1627 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
1628 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
1629 |
- -DPLUGIN_CASSANDRA=NO |
1630 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
1631 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
1632 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
1633 |
- -DCONNECT_WITH_MYSQL=1 |
1634 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
1635 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
1636 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
1637 |
- # Build failure and autodep wrt bug 639144 |
1638 |
- -DCONNECT_WITH_MONGO=OFF |
1639 |
- -DWITH_WSREP=$(usex galera) |
1640 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
1641 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
1642 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
1643 |
- -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) |
1644 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) |
1645 |
- -DWITH_MARIABACKUP=$(usex backup ON OFF) |
1646 |
- -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
1647 |
- -DINSTALL_SQLBENCHDIR="" |
1648 |
- -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO) |
1649 |
- # systemd is only linked to for server notification |
1650 |
- -DWITH_SYSTEMD=$(usex systemd yes no) |
1651 |
- -DWITH_NUMA=$(usex numa ON OFF) |
1652 |
- ) |
1653 |
- |
1654 |
- # Workaround for MDEV-14524 |
1655 |
- use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 ) |
1656 |
- |
1657 |
- if use test ; then |
1658 |
- # This is needed for the new client lib which tests a real, open server |
1659 |
- mycmakeargs+=( -DSKIP_TESTS=ON ) |
1660 |
- fi |
1661 |
- |
1662 |
- if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then |
1663 |
- ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" |
1664 |
- ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." |
1665 |
- ewarn "You MUST file bugs without these variables set." |
1666 |
- |
1667 |
- mycmakeargs+=( |
1668 |
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} |
1669 |
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} |
1670 |
- ) |
1671 |
- |
1672 |
- elif ! use latin1 ; then |
1673 |
- mycmakeargs+=( |
1674 |
- -DDEFAULT_CHARSET=utf8 |
1675 |
- -DDEFAULT_COLLATION=utf8_general_ci |
1676 |
- ) |
1677 |
- else |
1678 |
- mycmakeargs+=( |
1679 |
- -DDEFAULT_CHARSET=latin1 |
1680 |
- -DDEFAULT_COLLATION=latin1_swedish_ci |
1681 |
- ) |
1682 |
- fi |
1683 |
- mycmakeargs+=( |
1684 |
- -DEXTRA_CHARSETS=all |
1685 |
- -DMYSQL_USER=mysql |
1686 |
- -DDISABLE_SHARED=$(usex static YES NO) |
1687 |
- -DWITH_DEBUG=$(usex debug) |
1688 |
- -DWITH_EMBEDDED_SERVER=OFF |
1689 |
- -DWITH_PROFILING=$(usex profiling) |
1690 |
- ) |
1691 |
- |
1692 |
- if use static; then |
1693 |
- mycmakeargs+=( -DWITH_PIC=1 ) |
1694 |
- fi |
1695 |
- |
1696 |
- if use jemalloc || use tcmalloc ; then |
1697 |
- mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) |
1698 |
- fi |
1699 |
- |
1700 |
- # Storage engines |
1701 |
- mycmakeargs+=( |
1702 |
- -DWITH_ARCHIVE_STORAGE_ENGINE=1 |
1703 |
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 |
1704 |
- -DWITH_CSV_STORAGE_ENGINE=1 |
1705 |
- -DWITH_HEAP_STORAGE_ENGINE=1 |
1706 |
- -DWITH_INNOBASE_STORAGE_ENGINE=1 |
1707 |
- -DWITH_MYISAMMRG_STORAGE_ENGINE=1 |
1708 |
- -DWITH_MYISAM_STORAGE_ENGINE=1 |
1709 |
- -DWITH_PARTITION_STORAGE_ENGINE=1 |
1710 |
- ) |
1711 |
- |
1712 |
- else |
1713 |
- mycmakeargs+=( |
1714 |
- -DWITHOUT_SERVER=1 |
1715 |
- -DWITH_EMBEDDED_SERVER=OFF |
1716 |
- -DEXTRA_CHARSETS=none |
1717 |
- -DINSTALL_SQLBENCHDIR= |
1718 |
- -DWITH_SYSTEMD=no |
1719 |
- ) |
1720 |
- fi |
1721 |
- |
1722 |
- cmake-utils_src_configure |
1723 |
-} |
1724 |
- |
1725 |
-src_compile() { |
1726 |
- cmake-utils_src_compile |
1727 |
-} |
1728 |
- |
1729 |
-src_install() { |
1730 |
- cmake-utils_src_install |
1731 |
- |
1732 |
- # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used |
1733 |
- if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then |
1734 |
- rm "${ED}/usr/include/mysql/server/private/config.h" || die |
1735 |
- fi |
1736 |
- |
1737 |
- # Make sure the vars are correctly initialized |
1738 |
- mysql_init_vars |
1739 |
- |
1740 |
- # Convenience links |
1741 |
- einfo "Making Convenience links for mysqlcheck multi-call binary" |
1742 |
- dosym "mysqlcheck" "/usr/bin/mysqlanalyze" |
1743 |
- dosym "mysqlcheck" "/usr/bin/mysqlrepair" |
1744 |
- dosym "mysqlcheck" "/usr/bin/mysqloptimize" |
1745 |
- |
1746 |
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir |
1747 |
- if [[ -d "${ED}/usr/data" ]] ; then |
1748 |
- rm -Rf "${ED}/usr/data" || die |
1749 |
- fi |
1750 |
- |
1751 |
- # Unless they explicitly specific USE=test, then do not install the |
1752 |
- # testsuite. It DOES have a use to be installed, esp. when you want to do a |
1753 |
- # validation of your database configuration after tuning it. |
1754 |
- if ! use test ; then |
1755 |
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" |
1756 |
- fi |
1757 |
- |
1758 |
- # Configuration stuff |
1759 |
- einfo "Building default configuration ..." |
1760 |
- insinto "${MY_SYSCONFDIR#${EPREFIX}}" |
1761 |
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf |
1762 |
- cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die |
1763 |
- eprefixify "${TMPDIR}/my.cnf" |
1764 |
- doins "${TMPDIR}/my.cnf" |
1765 |
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d" |
1766 |
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die |
1767 |
- eprefixify "${TMPDIR}/50-distro-client.cnf" |
1768 |
- doins "${TMPDIR}/50-distro-client.cnf" |
1769 |
- |
1770 |
- if use server ; then |
1771 |
- mycnf_src="my.cnf.distro-server" |
1772 |
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ |
1773 |
- "${FILESDIR}/${mycnf_src}" \ |
1774 |
- > "${TMPDIR}/my.cnf.ok" || die |
1775 |
- if use prefix ; then |
1776 |
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ |
1777 |
- "${TMPDIR}/my.cnf.ok" || die |
1778 |
- fi |
1779 |
- if use latin1 ; then |
1780 |
- sed -i \ |
1781 |
- -e "/character-set/s|utf8|latin1|g" \ |
1782 |
- "${TMPDIR}/my.cnf.ok" || die |
1783 |
- fi |
1784 |
- eprefixify "${TMPDIR}/my.cnf.ok" |
1785 |
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf |
1786 |
- |
1787 |
- einfo "Including support files and sample configurations" |
1788 |
- docinto "support-files" |
1789 |
- local script |
1790 |
- for script in \ |
1791 |
- "${S}"/support-files/magic |
1792 |
- do |
1793 |
- [[ -f "$script" ]] && dodoc "${script}" |
1794 |
- done |
1795 |
- |
1796 |
- docinto "scripts" |
1797 |
- for script in "${S}"/scripts/mysql* ; do |
1798 |
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" |
1799 |
- done |
1800 |
- fi |
1801 |
- |
1802 |
- #Remove mytop if perl is not selected |
1803 |
- [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" |
1804 |
-} |
1805 |
- |
1806 |
-# Official test instructions: |
1807 |
-# USE='extraengine perl server' \ |
1808 |
-# FEATURES='test userpriv -usersandbox' \ |
1809 |
-# ebuild mariadb-X.X.XX.ebuild \ |
1810 |
-# digest clean package |
1811 |
-src_test() { |
1812 |
- |
1813 |
- _disable_test() { |
1814 |
- local rawtestname reason |
1815 |
- rawtestname="${1}" ; shift |
1816 |
- reason="${@}" |
1817 |
- ewarn "test '${rawtestname}' disabled: '${reason}'" |
1818 |
- echo ${rawtestname} : ${reason} >> "${T}/disabled.def" |
1819 |
- } |
1820 |
- |
1821 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
1822 |
- local retstatus_unit |
1823 |
- local retstatus_tests |
1824 |
- |
1825 |
- if ! use server ; then |
1826 |
- einfo "Skipping server tests due to minimal build." |
1827 |
- return 0 |
1828 |
- fi |
1829 |
- |
1830 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
1831 |
- # localhost. Also causes weird failures. |
1832 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
1833 |
- |
1834 |
- if [[ $UID -eq 0 ]]; then |
1835 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
1836 |
- fi |
1837 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
1838 |
- |
1839 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
1840 |
- |
1841 |
- # Run CTest (test-units) |
1842 |
- cmake-utils_src_test |
1843 |
- retstatus_unit=$? |
1844 |
- |
1845 |
- # Ensure that parallel runs don't die |
1846 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
1847 |
- # Enable parallel testing, auto will try to detect number of cores |
1848 |
- # You may set this by hand. |
1849 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
1850 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
1851 |
- |
1852 |
- # create directories because mysqladmin might run out of order |
1853 |
- mkdir -p "${T}"/var-tests{,/log} || die |
1854 |
- |
1855 |
- # Run mysql tests |
1856 |
- pushd "${TESTDIR}" > /dev/null || die |
1857 |
- |
1858 |
- touch "${T}/disabled.def" |
1859 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
1860 |
- # false positives: |
1861 |
- # |
1862 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
1863 |
- # main.mysql_client_test_comp: |
1864 |
- # segfaults at random under Portage only, suspect resource limits. |
1865 |
- |
1866 |
- local t |
1867 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
1868 |
- _disable_test "$t" "False positive due to varying policies" |
1869 |
- done |
1870 |
- |
1871 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
1872 |
- main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do |
1873 |
- _disable_test "$t" "False positives in Gentoo" |
1874 |
- done |
1875 |
- |
1876 |
- _disable_test main.plugin_auth "Needs client libraries built" |
1877 |
- |
1878 |
- # run mysql-test tests |
1879 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" |
1880 |
- retstatus_tests=$? |
1881 |
- |
1882 |
- popd > /dev/null || die |
1883 |
- |
1884 |
- # Cleanup is important for these testcases. |
1885 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
1886 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
1887 |
- |
1888 |
- local failures="" |
1889 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
1890 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
1891 |
- |
1892 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
1893 |
- einfo "Tests successfully completed" |
1894 |
-} |
1895 |
- |
1896 |
-mysql_init_vars() { |
1897 |
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} |
1898 |
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} |
1899 |
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} |
1900 |
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} |
1901 |
- |
1902 |
- if [[ -z "${MY_DATADIR}" ]] ; then |
1903 |
- MY_DATADIR="" |
1904 |
- if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then |
1905 |
- MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ |
1906 |
- | sed -ne '/datadir/s|^--datadir=||p' \ |
1907 |
- | tail -n1` |
1908 |
- if [[ -z "${MY_DATADIR}" ]] ; then |
1909 |
- MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ |
1910 |
- | sed -e 's/.*=\s*//' \ |
1911 |
- | tail -n1` |
1912 |
- fi |
1913 |
- fi |
1914 |
- if [[ -z "${MY_DATADIR}" ]] ; then |
1915 |
- MY_DATADIR="${MY_LOCALSTATEDIR}" |
1916 |
- einfo "Using default MY_DATADIR" |
1917 |
- fi |
1918 |
- elog "MySQL MY_DATADIR is ${MY_DATADIR}" |
1919 |
- |
1920 |
- if [[ -z "${PREVIOUS_DATADIR}" ]] ; then |
1921 |
- if [[ -e "${MY_DATADIR}" ]] ; then |
1922 |
- # If you get this and you're wondering about it, see bug #207636 |
1923 |
- elog "MySQL datadir found in ${MY_DATADIR}" |
1924 |
- elog "A new one will not be created." |
1925 |
- PREVIOUS_DATADIR="yes" |
1926 |
- else |
1927 |
- PREVIOUS_DATADIR="no" |
1928 |
- fi |
1929 |
- export PREVIOUS_DATADIR |
1930 |
- fi |
1931 |
- else |
1932 |
- if [[ ${EBUILD_PHASE} == "config" ]]; then |
1933 |
- local new_MY_DATADIR |
1934 |
- new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ |
1935 |
- | sed -ne '/datadir/s|^--datadir=||p' \ |
1936 |
- | tail -n1` |
1937 |
- |
1938 |
- if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then |
1939 |
- ewarn "MySQL MY_DATADIR has changed" |
1940 |
- ewarn "from ${MY_DATADIR}" |
1941 |
- ewarn "to ${new_MY_DATADIR}" |
1942 |
- MY_DATADIR="${new_MY_DATADIR}" |
1943 |
- fi |
1944 |
- fi |
1945 |
- fi |
1946 |
- |
1947 |
- export MY_SHAREDSTATEDIR MY_SYSCONFDIR |
1948 |
- export MY_LOCALSTATEDIR MY_LOGDIR |
1949 |
- export MY_DATADIR |
1950 |
-} |
1951 |
- |
1952 |
-pkg_config() { |
1953 |
- _getoptval() { |
1954 |
- local mypd="${EROOT}"/usr/bin/my_print_defaults |
1955 |
- local section="$1" |
1956 |
- local flag="--${2}=" |
1957 |
- local extra_options="${3}" |
1958 |
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" |
1959 |
- } |
1960 |
- local old_MY_DATADIR="${MY_DATADIR}" |
1961 |
- local old_HOME="${HOME}" |
1962 |
- # my_print_defaults needs to read stuff in $HOME/.my.cnf |
1963 |
- export HOME=${EPREFIX}/root |
1964 |
- |
1965 |
- # Make sure the vars are correctly initialized |
1966 |
- mysql_init_vars |
1967 |
- |
1968 |
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" |
1969 |
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then |
1970 |
- die "Minimal builds do NOT include the MySQL server" |
1971 |
- fi |
1972 |
- |
1973 |
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then |
1974 |
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" |
1975 |
- MY_DATADIR_s="${MY_DATADIR_s%%/}" |
1976 |
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" |
1977 |
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" |
1978 |
- |
1979 |
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then |
1980 |
- if [[ -d "${MY_DATADIR_s}" ]]; then |
1981 |
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" |
1982 |
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" |
1983 |
- else |
1984 |
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" |
1985 |
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ |
1986 |
- || die "Moving MY_DATADIR failed" |
1987 |
- fi |
1988 |
- else |
1989 |
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" |
1990 |
- if [[ -d "${MY_DATADIR_s}" ]]; then |
1991 |
- ewarn "Attempting to use ${MY_DATADIR_s}" |
1992 |
- else |
1993 |
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" |
1994 |
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" |
1995 |
- fi |
1996 |
- fi |
1997 |
- fi |
1998 |
- |
1999 |
- local pwd1="a" |
2000 |
- local pwd2="b" |
2001 |
- local maxtry=15 |
2002 |
- |
2003 |
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then |
2004 |
- local tmp_mysqld_password_source= |
2005 |
- |
2006 |
- for tmp_mysqld_password_source in mysql client; do |
2007 |
- einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." |
2008 |
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" |
2009 |
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then |
2010 |
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then |
2011 |
- ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" |
2012 |
- MYSQL_ROOT_PASSWORD= |
2013 |
- continue |
2014 |
- fi |
2015 |
- |
2016 |
- einfo "Found password in '${tmp_mysqld_password_source}' section!" |
2017 |
- break |
2018 |
- fi |
2019 |
- done |
2020 |
- |
2021 |
- # Sometimes --show is required to display passwords in some implementations of my_print_defaults |
2022 |
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then |
2023 |
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" |
2024 |
- fi |
2025 |
- |
2026 |
- unset tmp_mysqld_password_source |
2027 |
- fi |
2028 |
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" |
2029 |
- # These are dir+prefix |
2030 |
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" |
2031 |
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} |
2032 |
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" |
2033 |
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} |
2034 |
- |
2035 |
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then |
2036 |
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" |
2037 |
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" |
2038 |
- fi |
2039 |
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then |
2040 |
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" |
2041 |
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" |
2042 |
- fi |
2043 |
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then |
2044 |
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" |
2045 |
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" |
2046 |
- fi |
2047 |
- |
2048 |
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then |
2049 |
- ewarn "You have already a MySQL database in place." |
2050 |
- ewarn "(${ROOT}/${MY_DATADIR}/*)" |
2051 |
- ewarn "Please rename or delete it if you wish to replace it." |
2052 |
- die "MySQL database already exists!" |
2053 |
- fi |
2054 |
- |
2055 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
2056 |
- # localhost. Also causes weird failures. |
2057 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
2058 |
- |
2059 |
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then |
2060 |
- |
2061 |
- einfo "Please provide a password for the mysql 'root' user now" |
2062 |
- einfo "or through the ${HOME}/.my.cnf file." |
2063 |
- ewarn "Avoid [\"'\\_%] characters in the password" |
2064 |
- read -rsp " >" pwd1 ; echo |
2065 |
- |
2066 |
- einfo "Retype the password" |
2067 |
- read -rsp " >" pwd2 ; echo |
2068 |
- |
2069 |
- if [[ "x$pwd1" != "x$pwd2" ]] ; then |
2070 |
- die "Passwords are not the same" |
2071 |
- fi |
2072 |
- MYSQL_ROOT_PASSWORD="${pwd1}" |
2073 |
- unset pwd1 pwd2 |
2074 |
- fi |
2075 |
- |
2076 |
- local options |
2077 |
- local sqltmp="$(emktemp)" |
2078 |
- |
2079 |
- # Fix bug 446200. Don't reference host my.cnf, needs to come first, |
2080 |
- # see https://bugs.mysql.com/bug.php?id=31312 |
2081 |
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" |
2082 |
- |
2083 |
- # Figure out which options we need to disable to do the setup |
2084 |
- local helpfile="${TMPDIR}/mysqld-help" |
2085 |
- "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null |
2086 |
- for opt in grant-tables host-cache name-resolve networking slave-start \ |
2087 |
- federated ssl log-bin relay-log slow-query-log external-locking \ |
2088 |
- log-slave-updates \ |
2089 |
- ; do |
2090 |
- optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" |
2091 |
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" |
2092 |
- done |
2093 |
- |
2094 |
- einfo "Creating the mysql database and setting proper permissions on it ..." |
2095 |
- |
2096 |
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it |
2097 |
- PID_DIR="${EROOT}/var/run/mysqld" |
2098 |
- if [[ ! -d "${PID_DIR}" ]]; then |
2099 |
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" |
2100 |
- fi |
2101 |
- |
2102 |
- if [[ ! -d "${MY_DATADIR}" ]]; then |
2103 |
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" |
2104 |
- fi |
2105 |
- |
2106 |
- pushd "${TMPDIR}" &>/dev/null || die |
2107 |
- |
2108 |
- # Filling timezones, see |
2109 |
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html |
2110 |
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null |
2111 |
- |
2112 |
- local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) |
2113 |
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) |
2114 |
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) |
2115 |
- einfo "Command: ${cmd[*]}" |
2116 |
- su -s /bin/sh -c "${cmd[*]}" mysql \ |
2117 |
- >"${TMPDIR}"/mysql_install_db.log 2>&1 |
2118 |
- if [ $? -ne 0 ]; then |
2119 |
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 |
2120 |
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" |
2121 |
- fi |
2122 |
- popd &>/dev/null || die |
2123 |
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ |
2124 |
- || die "MySQL databases not installed" |
2125 |
- |
2126 |
- use prefix || options="${options} --user=mysql" |
2127 |
- |
2128 |
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" |
2129 |
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" |
2130 |
- local mysqld="${EROOT}/usr/sbin/mysqld \ |
2131 |
- ${options} \ |
2132 |
- --log-warnings=0 \ |
2133 |
- --basedir=${EROOT}/usr \ |
2134 |
- --datadir=${ROOT}/${MY_DATADIR} \ |
2135 |
- --max_allowed_packet=8M \ |
2136 |
- --net_buffer_length=16K \ |
2137 |
- --socket=${socket} \ |
2138 |
- --pid-file=${pidfile} |
2139 |
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}" |
2140 |
- #einfo "About to start mysqld: ${mysqld}" |
2141 |
- ebegin "Starting mysqld" |
2142 |
- einfo "Command ${mysqld}" |
2143 |
- ${mysqld} & |
2144 |
- rc=$? |
2145 |
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do |
2146 |
- maxtry=$((${maxtry}-1)) |
2147 |
- echo -n "." |
2148 |
- sleep 1 |
2149 |
- done |
2150 |
- eend $rc |
2151 |
- |
2152 |
- if ! [[ -S "${socket}" ]]; then |
2153 |
- die "Completely failed to start up mysqld with: ${mysqld}" |
2154 |
- fi |
2155 |
- |
2156 |
- ebegin "Setting root password" |
2157 |
- # Do this from memory, as we don't want clear text passwords in temp files |
2158 |
- local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" |
2159 |
- "${EROOT}/usr/bin/mysql" \ |
2160 |
- "--socket=${socket}" \ |
2161 |
- -hlocalhost \ |
2162 |
- -e "${sql}" |
2163 |
- eend $? |
2164 |
- |
2165 |
- if [[ -n "${sqltmp}" ]] ; then |
2166 |
- ebegin "Loading \"zoneinfo\", this step may require a few seconds" |
2167 |
- "${EROOT}/usr/bin/mysql" \ |
2168 |
- "--socket=${socket}" \ |
2169 |
- -hlocalhost \ |
2170 |
- -uroot \ |
2171 |
- --password="${MYSQL_ROOT_PASSWORD}" \ |
2172 |
- mysql < "${sqltmp}" |
2173 |
- rc=$? |
2174 |
- eend $? |
2175 |
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" |
2176 |
- fi |
2177 |
- |
2178 |
- # Stop the server and cleanup |
2179 |
- einfo "Stopping the server ..." |
2180 |
- kill $(< "${pidfile}" ) |
2181 |
- rm -f "${sqltmp}" |
2182 |
- wait %1 |
2183 |
- einfo "Done" |
2184 |
-} |
2185 |
|
2186 |
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml |
2187 |
index d17a7410d92..e58332a7acb 100644 |
2188 |
--- a/dev-db/mariadb/metadata.xml |
2189 |
+++ b/dev-db/mariadb/metadata.xml |
2190 |
@@ -8,7 +8,6 @@ |
2191 |
<use> |
2192 |
<flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag> |
2193 |
<flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages</flag> |
2194 |
- <flag name="embedded">Build embedded server (libmysqld)</flag> |
2195 |
<flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag> |
2196 |
<flag name="galera">Enables galera replication</flag> |
2197 |
<flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag> |
2198 |
@@ -20,7 +19,6 @@ |
2199 |
<flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag> |
2200 |
<flag name="mroonga">Add support for the Mroonga engine for interfacing with the Groonga text search</flag> |
2201 |
<flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag> |
2202 |
- <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag> |
2203 |
<flag name="oqgraph">Add support for the Open Query GRAPH engine</flag> |
2204 |
<flag name="pam">Enable the optional PAM authentication plugin for the server</flag> |
2205 |
<flag name="profiling">Add support for statement profiling (requires USE=community).</flag> |