1 |
grknight 14/11/26 00:34:41 |
2 |
|
3 |
Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass |
4 |
Log: |
5 |
Sync eclasses from mysql overlay |
6 |
|
7 |
Revision Changes Path |
8 |
1.1446 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1446&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1446&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1445&r2=1.1446 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1445 |
18 |
retrieving revision 1.1446 |
19 |
diff -u -r1.1445 -r1.1446 |
20 |
--- ChangeLog 24 Nov 2014 01:39:55 -0000 1.1445 |
21 |
+++ ChangeLog 26 Nov 2014 00:34:41 -0000 1.1446 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1445 2014/11/24 01:39:55 floppym Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1446 2014/11/26 00:34:41 grknight Exp $ |
27 |
+ |
28 |
+ 26 Nov 2014; Brian Evans <grknight@g.o> musql-cmake.eclass, |
29 |
+ mysql-multilib.eclass: |
30 |
+ Sync from mysql overlay |
31 |
|
32 |
24 Nov 2014; Mike Gilbert <floppym@g.o> distutils-r1.eclass: |
33 |
eqawarn about /usr/lib/pypy/share instead of dying. |
34 |
|
35 |
|
36 |
|
37 |
1.26 eclass/mysql-cmake.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.26&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.26&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.25&r2=1.26 |
42 |
|
43 |
Index: mysql-cmake.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v |
46 |
retrieving revision 1.25 |
47 |
retrieving revision 1.26 |
48 |
diff -u -r1.25 -r1.26 |
49 |
--- mysql-cmake.eclass 8 Oct 2014 17:25:46 -0000 1.25 |
50 |
+++ mysql-cmake.eclass 26 Nov 2014 00:34:41 -0000 1.26 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2014 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.25 2014/10/08 17:25:46 grknight Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 00:34:41 grknight Exp $ |
56 |
|
57 |
# @ECLASS: mysql-cmake.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -179,7 +179,6 @@ |
60 |
-DWITH_MYISAMMRG_STORAGE_ENGINE=1 |
61 |
-DWITH_MYISAM_STORAGE_ENGINE=1 |
62 |
-DWITH_PARTITION_STORAGE_ENGINE=1 |
63 |
- $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) |
64 |
) |
65 |
|
66 |
if in_iuse pbxt ; then |
67 |
@@ -187,10 +186,19 @@ |
68 |
fi |
69 |
|
70 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
71 |
+ |
72 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
73 |
+ if ! use extraengine ; then |
74 |
+ mycmakeargs+=( |
75 |
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 |
76 |
+ -DPLUGIN_FEDERATED=0 |
77 |
+ -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 |
78 |
+ -DPLUGIN_FEDERATEDX=0 ) |
79 |
+ fi |
80 |
+ |
81 |
mycmakeargs+=( |
82 |
$(mysql-cmake_use_plugin oqgraph OQGRAPH) |
83 |
$(mysql-cmake_use_plugin sphinx SPHINX) |
84 |
- $(mysql-cmake_use_plugin extraengine FEDERATEDX) |
85 |
$(mysql-cmake_use_plugin tokudb TOKUDB) |
86 |
$(mysql-cmake_use_plugin pam AUTH_PAM) |
87 |
) |
88 |
@@ -209,6 +217,23 @@ |
89 |
$(cmake-utils_use odbc CONNECT_WITH_ODBC) |
90 |
) |
91 |
fi |
92 |
+ |
93 |
+ if in_iuse mroonga ; then |
94 |
+ use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 ) |
95 |
+ else |
96 |
+ mycmakeargs+=( -DWITHOUT_MROONGA=1 ) |
97 |
+ fi |
98 |
+ |
99 |
+ if in_iuse galera ; then |
100 |
+ mycmakeargs+=( $(cmake-utils_use_with galera WSREP) ) |
101 |
+ fi |
102 |
+ |
103 |
+ if mysql_version_is_at_least "10.1.1" ; then |
104 |
+ mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4) |
105 |
+ $(cmake-utils_use_with innodb-lzo INNODB_LZO) ) |
106 |
+ fi |
107 |
+ else |
108 |
+ mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) |
109 |
fi |
110 |
|
111 |
if [[ ${PN} == "percona-server" ]]; then |
112 |
@@ -275,6 +300,12 @@ |
113 |
sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die |
114 |
fi |
115 |
|
116 |
+ # Remove the bundled groonga if it exists |
117 |
+ # There is no CMake flag, it simply checks for existance |
118 |
+ if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then |
119 |
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" |
120 |
+ fi |
121 |
+ |
122 |
epatch_user |
123 |
} |
124 |
|
125 |
|
126 |
|
127 |
|
128 |
1.11 eclass/mysql-multilib.eclass |
129 |
|
130 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.11&view=markup |
131 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.11&content-type=text/plain |
132 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.10&r2=1.11 |
133 |
|
134 |
Index: mysql-multilib.eclass |
135 |
=================================================================== |
136 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
137 |
retrieving revision 1.10 |
138 |
retrieving revision 1.11 |
139 |
diff -u -r1.10 -r1.11 |
140 |
--- mysql-multilib.eclass 8 Oct 2014 17:25:46 -0000 1.10 |
141 |
+++ mysql-multilib.eclass 26 Nov 2014 00:34:41 -0000 1.11 |
142 |
@@ -1,6 +1,6 @@ |
143 |
# Copyright 1999-2014 Gentoo Foundation |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.10 2014/10/08 17:25:46 grknight Exp $ |
146 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.11 2014/11/26 00:34:41 grknight Exp $ |
147 |
|
148 |
# @ECLASS: mysql-multilib.eclass |
149 |
# @MAINTAINER: |
150 |
@@ -205,10 +205,19 @@ |
151 |
mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \ |
152 |
REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )" |
153 |
REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" |
154 |
+ |
155 |
+ # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries |
156 |
+ # Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries |
157 |
+ mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo" |
158 |
fi |
159 |
|
160 |
-if [[ ${PN} == "mariadb-galera" ]]; then |
161 |
- IUSE="${IUSE} +sst-rsync sst-xtrabackup" |
162 |
+if [[ -n "${WSREP_REVISION}" ]]; then |
163 |
+ if [[ ${PN} == "mariadb" ]]; then |
164 |
+ IUSE="${IUSE} galera sst-rsync sst-xtrabackup" |
165 |
+ REQUIRED_USE="${REQUIRED_USE} sst-rsync? ( galera ) sst-xtrabackup? ( galera )" |
166 |
+ else |
167 |
+ IUSE="${IUSE} +sst-rsync sst-xtrabackup" |
168 |
+ fi |
169 |
fi |
170 |
|
171 |
if [[ ${PN} == "percona-server" ]]; then |
172 |
@@ -273,7 +282,12 @@ |
173 |
" |
174 |
fi |
175 |
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" |
176 |
- mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" |
177 |
+ mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]" |
178 |
+ |
179 |
+ mysql_version_is_at_least "10.1.1" && DEPEND="${DEPEND} |
180 |
+ innodb-lz4? ( app-arch/lz4 ) |
181 |
+ innodb-lzo? ( dev-libs/lzo ) |
182 |
+ " |
183 |
fi |
184 |
|
185 |
[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )" |
186 |
@@ -308,18 +322,23 @@ |
187 |
virtual/perl-Time-HiRes ) " |
188 |
fi |
189 |
|
190 |
-if [[ ${PN} == "mariadb-galera" ]] ; then |
191 |
+if [[ -n "${WSREP_REVISION}" ]] ; then |
192 |
# The wsrep API version must match between the ebuild and sys-cluster/galera. |
193 |
# This will be indicated by WSREP_REVISION in the ebuild and the first number |
194 |
# in the version of sys-cluster/galera |
195 |
# |
196 |
# lsof is required as of 5.5.38 and 10.0.11 for the rsync sst |
197 |
- RDEPEND="${RDEPEND} |
198 |
- sys-apps/iproute2 |
199 |
+ |
200 |
+ GALERA_RDEPEND="sys-apps/iproute2 |
201 |
=sys-cluster/galera-${WSREP_REVISION}* |
202 |
+ " |
203 |
+ if [[ ${PN} == "mariadb" ]]; then |
204 |
+ GALERA_RDEPEND="galera? ( ${GALERA_RDEPEND} )" |
205 |
+ fi |
206 |
+ RDEPEND="${RDEPEND} ${GALERA_RDEPEND} |
207 |
sst-rsync? ( sys-process/lsof ) |
208 |
sst-xtrabackup? ( |
209 |
- dev-db/xtrabackup-bin |
210 |
+ >=dev-db/xtrabackup-bin-2.2.4 |
211 |
net-misc/socat[ssl] |
212 |
) |
213 |
" |
214 |
@@ -345,6 +364,9 @@ |
215 |
# my_config.h includes ABI specific data |
216 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) |
217 |
|
218 |
+[[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \ |
219 |
+ MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
220 |
+ |
221 |
# wrap the config script |
222 |
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
223 |
|
224 |
@@ -393,7 +415,8 @@ |
225 |
mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup |
226 |
fi |
227 |
|
228 |
- if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then |
229 |
+ if use_if_iuse tokudb && [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 || \ |
230 |
+ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then |
231 |
eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." |
232 |
eerror "Please use gcc-config to switch to gcc-4.7 or later version." |
233 |
die |
234 |
@@ -470,12 +493,19 @@ |
235 |
-DWITHOUT_LIBWRAP=1 |
236 |
-DENABLED_LOCAL_INFILE=1 |
237 |
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock |
238 |
+ -DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock |
239 |
-DWITH_SSL=$(usex ssl system bundled) |
240 |
-DWITH_DEFAULT_COMPILER_OPTIONS=0 |
241 |
-DWITH_DEFAULT_FEATURE_SET=0 |
242 |
- $(cmake-utils_use_enable systemtap DTRACE) |
243 |
) |
244 |
|
245 |
+ # systemtap only works on native ABI bug 530132 |
246 |
+ if multilib_is_native_abi; then |
247 |
+ mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) |
248 |
+ else |
249 |
+ mycmakeargs+=( -DENABLE_DTRACE=0 ) |
250 |
+ fi |
251 |
+ |
252 |
if in_iuse bindist ; then |
253 |
mycmakeargs+=( |
254 |
-DWITH_READLINE=$(usex bindist 1 0) |