| 1 |
commit: 44dd9ff5bceb535331c9c5c4dee596e224f177d0 |
| 2 |
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 9 09:38:46 2018 +0000 |
| 4 |
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 9 09:38:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44dd9ff5 |
| 7 |
|
| 8 |
dev-db/tokumx: Updated patching to avoid GCC 8 final link failure. |
| 9 |
|
| 10 |
Updated patch by Mariusz Ceier to avoid final link failure on GCC 8. |
| 11 |
It also seems significantly cleaner. Removing 2.0.2 and bumping up |
| 12 |
revision. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/625158 |
| 15 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 16 |
|
| 17 |
.../files/tokumx-2.0.2-undefined-reference.patch | 60 +++++----------------- |
| 18 |
...{tokumx-2.0.2.ebuild => tokumx-2.0.2-r1.ebuild} | 1 - |
| 19 |
2 files changed, 14 insertions(+), 47 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch b/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch |
| 22 |
index 012498f7ecd..d56f7745d1e 100644 |
| 23 |
--- a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch |
| 24 |
+++ b/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch |
| 25 |
@@ -1,47 +1,15 @@ |
| 26 |
-diff -uNr a/src/third_party/backup/copier.cc b/src/third_party/backup/copier.cc |
| 27 |
---- a/src/third_party/backup/copier.cc 2018-07-06 12:43:52.698825122 +0200 |
| 28 |
-+++ b/src/third_party/backup/copier.cc 2018-07-06 12:41:40.066804121 +0200 |
| 29 |
-@@ -107,10 +107,12 @@ |
| 30 |
- int r = 0; |
| 31 |
- char *fname = 0; |
| 32 |
- size_t n_known = 0; |
| 33 |
-+ char *dupname; |
| 34 |
- { |
| 35 |
- with_mutex_locked tm(&m_todo_mutex, BACKTRACE(NULL)); |
| 36 |
- // Start with "." |
| 37 |
-- m_todo.push_back(strdup(".")); |
| 38 |
-+ dupname = strdup("."); |
| 39 |
-+ m_todo.push_back(dupname); |
| 40 |
- n_known = m_todo.size(); |
| 41 |
- } |
| 42 |
- while (n_known != 0) { |
| 43 |
-@@ -697,6 +699,7 @@ |
| 44 |
- int error = 0; |
| 45 |
- with_mutex_locked tm(&m_todo_mutex, BACKTRACE(NULL)); |
| 46 |
- struct dirent const *e = NULL; |
| 47 |
-+ char *dupname; |
| 48 |
- while((e = readdir(dir)) != NULL) { |
| 49 |
- if (!the_manager.copy_is_enabled()) break; |
| 50 |
- if(is_dot(e)) { |
| 51 |
-@@ -716,8 +719,9 @@ |
| 52 |
- goto out; |
| 53 |
- } |
| 54 |
- |
| 55 |
-+ dupname = strdup(new_name); |
| 56 |
- // Add it to our todo list. |
| 57 |
-- m_todo.push_back(strdup(new_name)); |
| 58 |
-+ m_todo.push_back(dupname); |
| 59 |
- TRACE("~~~Added this file to todo list:", new_name); |
| 60 |
- } |
| 61 |
- } |
| 62 |
-@@ -730,7 +734,9 @@ |
| 63 |
- // |
| 64 |
- void copier::add_file_to_todo(const char *file) throw() { |
| 65 |
- with_mutex_locked tm(&m_todo_mutex, BACKTRACE(NULL)); |
| 66 |
-- m_todo.push_back(strdup(file)); |
| 67 |
-+ char *dupname; |
| 68 |
-+ dupname = strdup(file); |
| 69 |
-+ m_todo.push_back(dupname); |
| 70 |
- } |
| 71 |
+diff -uNr a/src/third_party/backup/CMakeLists.txt b/src/third_party/backup/CMakeLists.txt |
| 72 |
+--- a/src/third_party/backup/CMakeLists.txt 2018-07-06 20:36:58.242767167 +0200 |
| 73 |
++++ b/src/third_party/backup/CMakeLists.txt 2018-07-06 20:37:31.575390786 +0200 |
| 74 |
+@@ -1,11 +1,6 @@ |
| 75 |
+ cmake_minimum_required(VERSION 2.8.8) |
| 76 |
+ project(HotBackup) |
| 77 |
|
| 78 |
- //////////////////////////////////////////////////////////////////////////////// |
| 79 |
+-# No implicit templates, since that's how mysql compiles. |
| 80 |
+-if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) |
| 81 |
+- set(CMAKE_CXX_FLAGS "-fno-implicit-templates ${CMAKE_CXX_FLAGS}") |
| 82 |
+-endif () |
| 83 |
+- |
| 84 |
+ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS |
| 85 |
+ _FILE_OFFSET_BITS=64 |
| 86 |
+ _LARGEFILE64_SOURCE) |
| 87 |
|
| 88 |
diff --git a/dev-db/tokumx/tokumx-2.0.2.ebuild b/dev-db/tokumx/tokumx-2.0.2-r1.ebuild |
| 89 |
similarity index 99% |
| 90 |
rename from dev-db/tokumx/tokumx-2.0.2.ebuild |
| 91 |
rename to dev-db/tokumx/tokumx-2.0.2-r1.ebuild |
| 92 |
index 04851a08462..866bdec8d24 100644 |
| 93 |
--- a/dev-db/tokumx/tokumx-2.0.2.ebuild |
| 94 |
+++ b/dev-db/tokumx/tokumx-2.0.2-r1.ebuild |
| 95 |
@@ -50,7 +50,6 @@ src_configure() { |
| 96 |
local mycmakeargs=( |
| 97 |
-DTOKU_DEBUG_PARANOID=OFF |
| 98 |
-DUSE_VALGRIND=OFF |
| 99 |
- -DUSE_BDB=OFF |
| 100 |
-DBUILD_TESTING=OFF |
| 101 |
-DTOKUMX_DISTNAME=${PV} |
| 102 |
-DLIBJEMALLOC="jemalloc" |
Archives