summaryrefslogtreecommitdiff
path: root/dev-db/tokumx/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/tokumx/files')
-rw-r--r--dev-db/tokumx/files/1.5.0-Werror.diff45
-rw-r--r--dev-db/tokumx/files/1.5.0-boost-57.diff11
-rw-r--r--dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch22
-rw-r--r--dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch102
-rw-r--r--dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch88
-rw-r--r--dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch15
-rw-r--r--dev-db/tokumx/files/tokumx-disable-bundled-libs.patch11
7 files changed, 0 insertions, 294 deletions
diff --git a/dev-db/tokumx/files/1.5.0-Werror.diff b/dev-db/tokumx/files/1.5.0-Werror.diff
deleted file mode 100644
index a865fe074f37..000000000000
--- a/dev-db/tokumx/files/1.5.0-Werror.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -uNr work.ORIG/mongo/CMakeLists.txt work/mongo/CMakeLists.txt
---- work.ORIG/mongo/CMakeLists.txt 2014-08-01 11:51:20.832614062 +0100
-+++ work/mongo/CMakeLists.txt 2014-08-01 11:51:36.898614862 +0100
-@@ -71,14 +71,13 @@
- endforeach(flag)
- endmacro(set_cxxflags_if_supported)
-
--set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
-+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
- set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
- set_cxxflags_if_supported(
- -Wall
- -Wsign-compare
- -Wno-unknown-pragmas
- -Winvalid-pch
-- -Werror
- -pipe
- -Wnon-virtual-dtor
- -Woverloaded-virtual
-diff -uNr work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
---- work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:20.696614056 +0100
-+++ work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:36.898614862 +0100
-@@ -174,8 +174,8 @@
- endif ()
-
- ## always want these
--set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
--set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
-+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
-
- ## need to set -stdlib=libc++ to get real c++11 support on darwin
- if (APPLE)
-diff -uNr work.ORIG/mongo/src/third_party/ft-index/examples/Makefile work/mongo/src/third_party/ft-index/examples/Makefile
---- work.ORIG/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:20.676614055 +0100
-+++ work/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:36.898614862 +0100
-@@ -1,7 +1,7 @@
- SRCS = $(wildcard *.c)
- TARGETS = $(patsubst %.c,%,$(SRCS)) $(patsubst %.c,%-bdb,$(SRCS))
- CPPFLAGS = -I../include -D_GNU_SOURCE
--CFLAGS = -g -std=c99 -Wall -Wextra -Werror -Wno-missing-field-initializers
-+CFLAGS = -g -std=c99 -Wall -Wextra -Wno-missing-field-initializers
- ifeq ($(USE_STATIC_LIBS),1)
- LIBTOKUDB = tokufractaltree_static
- LIBTOKUPORTABILITY = tokuportability_static
diff --git a/dev-db/tokumx/files/1.5.0-boost-57.diff b/dev-db/tokumx/files/1.5.0-boost-57.diff
deleted file mode 100644
index e66aec168712..000000000000
--- a/dev-db/tokumx/files/1.5.0-boost-57.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h work/mongo/src/mongo/shell/linenoise_utf8.h
---- work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:20:51.880842717 +0100
-+++ work/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:21:26.002844416 +0100
-@@ -16,6 +16,7 @@
- */
-
- #include <boost/smart_ptr/scoped_array.hpp>
-+#include <algorithm>
- #include <string.h>
-
- namespace linenoise_utf8 {
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch b/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
deleted file mode 100644
index 52b3b9f12064..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise.cpp tokumx-enterprise-2.0.2/src/mongo/shell/linenoise.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise.cpp 2016-11-21 11:52:54.883542356 +0000
-+++ tokumx-enterprise-2.0.2/src/mongo/shell/linenoise.cpp 2016-11-21 11:53:11.995543208 +0000
-@@ -117,6 +117,7 @@
- #include "mk_wcwidth.h"
- #include <string>
- #include <vector>
-+#include <algorithm>
- #include <boost/smart_ptr/scoped_array.hpp>
-
- using std::string;
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise_utf8.h tokumx-enterprise-2.0.2/src/mongo/shell/linenoise_utf8.h
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise_utf8.h 2016-11-21 11:52:54.883542356 +0000
-+++ tokumx-enterprise-2.0.2/src/mongo/shell/linenoise_utf8.h 2016-11-21 11:53:31.610544185 +0000
-@@ -15,6 +15,7 @@
- * limitations under the License.
- */
-
-+#include <algorithm>
- #include <boost/smart_ptr/scoped_array.hpp>
- #include <string.h>
-
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch b/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch
deleted file mode 100644
index 1203d1fc8098..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp tokumx-enterprise-2.0.2/src/mongo/db/client_load.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp 2018-07-03 15:57:40.709360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/client_load.cpp 2018-07-03 15:57:48.127361253 +0100
-@@ -74,7 +74,7 @@
- }
-
- bool Client::loadInProgress() const {
-- return _loadInfo;
-+ return bool(_loadInfo);
- }
-
- } // namespace mongo
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h tokumx-enterprise-2.0.2/src/mongo/db/collection_map.h
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h 2018-07-03 15:57:40.709360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/collection_map.h 2018-07-03 15:57:48.127361253 +0100
-@@ -66,7 +66,7 @@
- // which must succeed, by the first invariant.
- Collection *getCollection(const StringData &ns);
-
-- bool allocated() const { return _metadb; }
-+ bool allocated() const { return bool(_metadb); }
-
- void getNamespaces( list<string>& tofill );
-
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp tokumx-enterprise-2.0.2/src/mongo/db/ops/query.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp 2018-07-03 15:57:40.703360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/ops/query.cpp 2018-07-03 15:58:08.348362094 +0100
-@@ -635,7 +635,7 @@
- shared_ptr<ExplainRecordingStrategy> ret
- ( new SimpleCursorExplainStrategy( ancillaryInfo, _cursor ) );
- ret->notePlan( queryPlan.valid() && queryPlan.scanAndOrderRequired,
-- queryPlan.keyFieldsOnly );
-+ bool(queryPlan.keyFieldsOnly) );
- return ret;
- }
-
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp tokumx-enterprise-2.0.2/src/mongo/db/pipeline/document_source_sort.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp 2018-07-03 15:57:40.707360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/pipeline/document_source_sort.cpp 2018-07-03 15:57:48.128361253 +0100
-@@ -106,7 +106,7 @@
- bool DocumentSourceSort::coalesce(const intrusive_ptr<DocumentSource> &pNextSource) {
- if (!limitSrc) {
- limitSrc = dynamic_cast<DocumentSourceLimit*>(pNextSource.get());
-- return limitSrc; // false if next is not a $limit
-+ return bool(limitSrc); // false if next is not a $limit
- }
- else {
- return limitSrc->coalesce(pNextSource);
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp tokumx-enterprise-2.0.2/src/mongo/db/queryoptimizercursorimpl.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp 2018-07-03 15:57:40.702360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/queryoptimizercursorimpl.cpp 2018-07-03 15:57:48.128361253 +0100
-@@ -370,7 +370,7 @@
-
- // The query plan must have a matcher. The matcher's constructor performs some aspects
- // of query validation that should occur before a cursor is returned.
-- fassert( 16449, singlePlan->matcher() );
-+ fassert( 16449, bool(singlePlan->matcher()) );
-
- if ( needMatcher ) {
- single->setMatcher( singlePlan->matcher() );
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_optimizer_internal.cpp tokumx-enterprise-2.0.2/src/mongo/db/query_optimizer_internal.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_optimizer_internal.cpp 2018-07-03 15:57:40.707360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/query_optimizer_internal.cpp 2018-07-03 15:57:48.129361253 +0100
-@@ -234,7 +234,7 @@
- // The query plan must have a matcher. The matcher's constructor performs some aspects
- // of query validation that should occur as part of this class's init() if not handled
- // already.
-- fassert( 16249, queryPlan().matcher() );
-+ fassert( 16249, bool(queryPlan().matcher()) );
-
- // TODO This violates the current Cursor interface abstraction, but for now it's simpler to keep our own set of
- // dups rather than avoid poisoning the cursor's dup set with unreturned documents. Deduping documents
-@@ -257,7 +257,7 @@
- _explainPlanInfo.reset( new ExplainPlanInfo() );
- _explainPlanInfo->notePlan( *_c,
- queryPlan().scanAndOrderRequired(),
-- queryPlan().keyFieldsOnly() );
-+ bool(queryPlan().keyFieldsOnly()) );
- return _explainPlanInfo;
- }
-
-@@ -1226,7 +1226,7 @@
- _explainPlanInfo.reset( new ExplainPlanInfo() );
- _explainPlanInfo->notePlan( *_c,
- _queryPlan->scanAndOrderRequired(),
-- _queryPlan->keyFieldsOnly() );
-+ bool(_queryPlan->keyFieldsOnly()) );
- shared_ptr<ExplainClauseInfo> clauseInfo( new ExplainClauseInfo() );
- clauseInfo->addPlanInfo( _explainPlanInfo );
- _mps->addClauseInfo( clauseInfo );
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h tokumx-enterprise-2.0.2/src/mongo/db/query_plan_summary.h
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h 2018-07-03 15:57:40.705360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/query_plan_summary.h 2018-07-03 15:57:48.129361253 +0100
-@@ -35,7 +35,7 @@
- * The 'fieldRangeMulti' attribute is required, and its presence indicates the object has
- * been configured with a query plan.
- */
-- bool valid() const { return fieldRangeSetMulti; }
-+ bool valid() const { return bool(fieldRangeSetMulti); }
-
- // A description of the valid values for the fields of a query, in the context of a multikey
- // index or in memory sort.
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
deleted file mode 100644
index 5a0c160e8866..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt 2016-11-21 11:15:27.517430430 +0000
-+++ tokumx-enterprise-2.0.2/CMakeLists.txt 2016-11-21 11:16:27.874433436 +0000
-@@ -82,14 +82,13 @@
- endforeach(flag)
- endmacro(set_cxxflags_if_supported)
-
--set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
-+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
- set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
- set_cxxflags_if_supported(
- -Wall
- -Wsign-compare
- -Wno-unknown-pragmas
- -Winvalid-pch
-- -Werror
- -pipe
- -Wnon-virtual-dtor
- -Woverloaded-virtual
-diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
---- tokumx-enterprise-2.0.2.ORIG/SConstruct 2016-11-21 11:15:27.517430430 +0000
-+++ tokumx-enterprise-2.0.2/SConstruct 2016-11-21 11:16:27.875433436 +0000
-@@ -710,7 +710,7 @@
- "-Winvalid-pch"] )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux:
-- env.Append( CCFLAGS=["-Werror", "-pipe"] )
-+ env.Append( CCFLAGS=["-pipe"] )
- if not has_option('clang'):
- env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
-
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/CMakeLists.txt tokumx-enterprise-2.0.2/src/third_party/backup/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/CMakeLists.txt 2016-11-21 11:15:27.392430424 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/backup/CMakeLists.txt 2016-11-21 11:17:22.576436161 +0000
-@@ -10,7 +10,7 @@
- _FILE_OFFSET_BITS=64
- _LARGEFILE64_SOURCE)
-
--set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
-
- set(USE_VALGRIND ON CACHE BOOL "whether to use valgrind headers")
- if (USE_VALGRIND)
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/remote/Makefile tokumx-enterprise-2.0.2/src/third_party/backup/remote/Makefile
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/remote/Makefile 2016-11-21 11:15:27.393430424 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/backup/remote/Makefile 2016-11-21 11:17:38.840436971 +0000
-@@ -1,4 +1,4 @@
- backup.pb.o: backup.pb.h
--CXXFLAGS = -W -Wall -Werror -O1
-+CXXFLAGS = -W -Wall -O1
- backup.pb.cc backup.bp.h: backup.proto
- protoc -I=. --cpp_out=. backup.proto
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake tokumx-enterprise-2.0.2/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2016-11-21 11:15:27.422430426 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2016-11-21 11:16:54.312434753 +0000
-@@ -181,8 +181,8 @@
- endif ()
-
- ## always want these
--set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
--set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
-+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
-
- ## need to set -stdlib=libc++ to get real c++11 support on darwin
- if (APPLE)
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/CMakeLists.txt tokumx-enterprise-2.0.2/src/third_party/v8/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/CMakeLists.txt 2016-11-21 11:15:27.452430427 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/v8/CMakeLists.txt 2016-11-21 11:16:27.876433437 +0000
-@@ -126,7 +126,6 @@
-
- set(V8_CXX_FLAGS
- -Wall
-- -Werror
- -W
- -Wno-unused-parameter
- -Woverloaded-virtual
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/SConscript tokumx-enterprise-2.0.2/src/third_party/v8/SConscript
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/SConscript 2016-11-21 11:15:27.452430427 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/v8/SConscript 2016-11-21 11:16:27.876433437 +0000
-@@ -47,7 +47,6 @@
- 'gcc': {
- 'all': {
- 'CCFLAGS': ['-Wall',
-- '-Werror',
- '-W',
- '-Wno-unused-parameter',
- '-Woverloaded-virtual',
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
deleted file mode 100644
index d56f7745d1e9..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr a/src/third_party/backup/CMakeLists.txt b/src/third_party/backup/CMakeLists.txt
---- a/src/third_party/backup/CMakeLists.txt 2018-07-06 20:36:58.242767167 +0200
-+++ b/src/third_party/backup/CMakeLists.txt 2018-07-06 20:37:31.575390786 +0200
-@@ -1,11 +1,6 @@
- cmake_minimum_required(VERSION 2.8.8)
- project(HotBackup)
-
--# No implicit templates, since that's how mysql compiles.
--if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
-- set(CMAKE_CXX_FLAGS "-fno-implicit-templates ${CMAKE_CXX_FLAGS}")
--endif ()
--
- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
- _FILE_OFFSET_BITS=64
- _LARGEFILE64_SOURCE)
diff --git a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch b/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
deleted file mode 100644
index 66d8db3980fa..000000000000
--- a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -auwrN a/src/third_party/ft-index/CMakeLists.txt b/src/third_party/ft-index/CMakeLists.txt
---- a/src/third_party/ft-index/CMakeLists.txt 2014-08-01 04:37:33.000000000 -0400
-+++ b/src/third_party/ft-index/CMakeLists.txt 2014-08-01 10:38:28.134869689 -0400
-@@ -35,7 +35,6 @@
- include(TokuFeatureDetection)
- include(TokuSetupCompiler)
- include(TokuSetupCTest)
--include(TokuThirdParty)
-
- set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- include(TokuMergeLibs)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 02:42:09 +0000