1 |
commit: ffe7f6740db6aee805faebc1c61992f0c46fbc72 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 17:37:14 2020 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 17:37:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe7f674 |
7 |
|
8 |
dev-db/mariadb: Fix fno-common error with 10.1.44 |
9 |
|
10 |
This error is not present in other versions as the affected file |
11 |
was transitioned to CXX correctly in 10.2+ and does not exist in 5.5 |
12 |
|
13 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
14 |
|
15 |
dev-db/mariadb/mariadb-10.1.44.ebuild | 3 +++ |
16 |
1 file changed, 3 insertions(+) |
17 |
|
18 |
diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild |
19 |
index 75342265967..5e7691b1973 100644 |
20 |
--- a/dev-db/mariadb/mariadb-10.1.44.ebuild |
21 |
+++ b/dev-db/mariadb/mariadb-10.1.44.ebuild |
22 |
@@ -243,6 +243,9 @@ src_prepare() { |
23 |
sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die |
24 |
sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die |
25 |
|
26 |
+ # Fix -fno-common error |
27 |
+ sed -i -e '/^datasink_t datasink_buffer;$/d' extra/mariabackup/xbstream.c || die |
28 |
+ |
29 |
local plugin |
30 |
local server_plugins=( handler_socket auth_socket feedback metadata_lock_info |
31 |
locale_info qc_info server_audit semisync sql_errlog ) |