1 |
commit: d3e5bdabd030966f001af4c67e86bf06563f52d2 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 31 11:22:41 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 31 11:30:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e5bdab |
7 |
|
8 |
dev-db/mariadb: drop USE=tokudb |
9 |
|
10 |
Closes: https://bugs.gentoo.org/739414 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
dev-db/mariadb/mariadb-10.5.5.ebuild | 22 ++-------------------- |
15 |
1 file changed, 2 insertions(+), 20 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/mariadb/mariadb-10.5.5.ebuild b/dev-db/mariadb/mariadb-10.5.5.ebuild |
18 |
index a7ee7f47d3e..4e750646088 100644 |
19 |
--- a/dev-db/mariadb/mariadb-10.5.5.ebuild |
20 |
+++ b/dev-db/mariadb/mariadb-10.5.5.ebuild |
21 |
@@ -23,13 +23,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 |
22 |
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga |
23 |
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx |
24 |
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc |
25 |
- test tokudb xml yassl" |
26 |
+ test xml yassl" |
27 |
|
28 |
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
29 |
RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" |
30 |
|
31 |
REQUIRED_USE="jdbc? ( extraengine server !static ) |
32 |
- server? ( tokudb? ( jemalloc !tcmalloc ) ) |
33 |
?? ( tcmalloc jemalloc ) |
34 |
static? ( yassl !pam )" |
35 |
|
36 |
@@ -80,7 +79,6 @@ COMMON_DEPEND=" |
37 |
pam? ( sys-libs/pam:0= ) |
38 |
s3? ( net-misc/curl ) |
39 |
systemd? ( sys-apps/systemd:= ) |
40 |
- tokudb? ( app-arch/snappy ) |
41 |
) |
42 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
43 |
tcmalloc? ( dev-util/google-perftools:0= ) |
44 |
@@ -195,13 +193,6 @@ pkg_setup() { |
45 |
local GCC_MAJOR_SET=$(gcc-major-version) |
46 |
local GCC_MINOR_SET=$(gcc-minor-version) |
47 |
|
48 |
- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ |
49 |
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then |
50 |
- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." |
51 |
- eerror "Please use gcc-config to switch to gcc-4.7 or later version." |
52 |
- die |
53 |
- fi |
54 |
- |
55 |
# Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on |
56 |
# non x86{,_64} arches |
57 |
if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ |
58 |
@@ -249,11 +240,6 @@ src_prepare() { |
59 |
echo "TARGET_LINK_LIBRARIES(mariadbd tcmalloc)" >> "${S}/sql/CMakeLists.txt" |
60 |
fi |
61 |
|
62 |
- # Don't build bundled xz-utils for tokudb |
63 |
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die |
64 |
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die |
65 |
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die |
66 |
- |
67 |
local plugin |
68 |
local server_plugins=( handler_socket auth_socket feedback metadata_lock_info |
69 |
locale_info qc_info server_audit sql_errlog auth_ed25519 ) |
70 |
@@ -400,7 +386,6 @@ src_configure() { |
71 |
-DWITH_PCRE=system |
72 |
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) |
73 |
-DPLUGIN_SPHINX=$(usex sphinx YES NO) |
74 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
75 |
-DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
76 |
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
77 |
-DPLUGIN_CASSANDRA=NO |
78 |
@@ -430,9 +415,6 @@ src_configure() { |
79 |
-DWITH_NUMA=$(usex numa ON OFF) |
80 |
) |
81 |
|
82 |
- # Workaround for MDEV-14524 |
83 |
- use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 ) |
84 |
- |
85 |
if use test ; then |
86 |
# This is needed for the new client lib which tests a real, open server |
87 |
mycmakeargs+=( -DSKIP_TESTS=ON ) |
88 |
@@ -617,7 +599,7 @@ src_test() { |
89 |
|
90 |
# run mysql-test tests |
91 |
pushd "${TESTDIR}" &>/dev/null || die |
92 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" |
93 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def" |
94 |
retstatus_tests=$? |
95 |
|
96 |
popd &>/dev/null || die |