diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/tokumx/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/tokumx/files')
-rw-r--r-- | dev-db/tokumx/files/1.5.0-Werror.diff | 45 | ||||
-rw-r--r-- | dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch | 53 | ||||
-rw-r--r-- | dev-db/tokumx/files/tokumx-disable-bundled-libs.patch | 11 |
3 files changed, 109 insertions, 0 deletions
diff --git a/dev-db/tokumx/files/1.5.0-Werror.diff b/dev-db/tokumx/files/1.5.0-Werror.diff new file mode 100644 index 000000000000..a865fe074f37 --- /dev/null +++ b/dev-db/tokumx/files/1.5.0-Werror.diff @@ -0,0 +1,45 @@ +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/tokumx-2.0.1-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch new file mode 100644 index 000000000000..a67cde50b7f4 --- /dev/null +++ b/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch @@ -0,0 +1,53 @@ +diff -uNr mongo-tokumx-2.0.1.ORIG/CMakeLists.txt mongo-tokumx-2.0.1/CMakeLists.txt +--- mongo-tokumx-2.0.1.ORIG/CMakeLists.txt 2015-04-14 11:28:47.723631388 +0100 ++++ mongo-tokumx-2.0.1/CMakeLists.txt 2015-04-14 11:29:04.734632235 +0100 +@@ -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 mongo-tokumx-2.0.1.ORIG/SConstruct mongo-tokumx-2.0.1/SConstruct +--- mongo-tokumx-2.0.1.ORIG/SConstruct 2015-04-14 11:28:47.724631388 +0100 ++++ mongo-tokumx-2.0.1/SConstruct 2015-04-14 11:29:20.550633023 +0100 +@@ -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 mongo-tokumx-2.0.1.ORIG/src/third_party/v8/CMakeLists.txt mongo-tokumx-2.0.1/src/third_party/v8/CMakeLists.txt +--- mongo-tokumx-2.0.1.ORIG/src/third_party/v8/CMakeLists.txt 2015-04-14 11:28:47.853631395 +0100 ++++ mongo-tokumx-2.0.1/src/third_party/v8/CMakeLists.txt 2015-04-14 11:30:00.934635034 +0100 +@@ -126,7 +126,6 @@ + + set(V8_CXX_FLAGS + -Wall +- -Werror + -W + -Wno-unused-parameter + -Woverloaded-virtual +diff -uNr mongo-tokumx-2.0.1.ORIG/src/third_party/v8/SConscript mongo-tokumx-2.0.1/src/third_party/v8/SConscript +--- mongo-tokumx-2.0.1.ORIG/src/third_party/v8/SConscript 2015-04-14 11:28:47.836631394 +0100 ++++ mongo-tokumx-2.0.1/src/third_party/v8/SConscript 2015-04-14 11:29:49.341634457 +0100 +@@ -47,7 +47,6 @@ + 'gcc': { + 'all': { + 'CCFLAGS': ['-Wall', +- '-Werror', + '-W', + '-Wno-unused-parameter', + '-Woverloaded-virtual', diff --git a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch b/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch new file mode 100644 index 000000000000..66d8db3980fa --- /dev/null +++ b/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch @@ -0,0 +1,11 @@ +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) |