* [gentoo-commits] repo/gentoo:master commit in: dev-db/tokumx/, dev-db/tokumx/files/
@ 2016-11-21 12:24 Tony Vroon
0 siblings, 0 replies; 2+ messages in thread
From: Tony Vroon @ 2016-11-21 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 5cbc4f0be4150956a7257c3bd36cc84b6ca224cd
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 12:23:58 2016 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 12:24:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cbc4f0b
dev-db/tokumx: Version bump to 2.0.2; remove all previous builds which are broken in various ways and essentially unfixable.
Package-Manager: portage-2.3.2
dev-db/tokumx/Manifest | 3 +-
dev-db/tokumx/files/1.5.0-Werror.diff | 45 -----------
dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch | 53 -------------
dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch | 22 ++++++
dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch | 88 ++++++++++++++++++++++
.../tokumx/files/tokumx-disable-bundled-libs.patch | 11 ---
dev-db/tokumx/tokumx-1.5.0-r1.ebuild | 72 ------------------
dev-db/tokumx/tokumx-1.5.0.ebuild | 49 ------------
.../{tokumx-2.0.1.ebuild => tokumx-2.0.2.ebuild} | 36 ++++-----
9 files changed, 130 insertions(+), 249 deletions(-)
diff --git a/dev-db/tokumx/Manifest b/dev-db/tokumx/Manifest
index 8f08157..4b8c9db 100644
--- a/dev-db/tokumx/Manifest
+++ b/dev-db/tokumx/Manifest
@@ -1,2 +1 @@
-DIST tokumx-git-tag-1.5.0.tar.bz2 13059584 SHA256 381747c47073c8a6f8717a27756bb793ec6d80f4f7d119385f8d7b805a3d827d SHA512 ba19237db7d3dcbd3ac07b8cc4860549830fa065fa4d26cbae685274524cd5b89f671d5f126ec25bee605c99929ce0436bb2ac32d67efdbb8dd6d7526d3f1c24 WHIRLPOOL e5e33e28ce55b1abcff603a40453ab0a9d68f61cd15c68950dd6f87371565bd05057e8e48475f772524684fdb744093867423b249614d4c02908a467f9380c75
-DIST tokumx-git-tag-2.0.1.tar.bz2 13444046 SHA256 f60be4bdabf1249b138b2da02cfc278f6296a8082ada1665be6c8b49c61c0e57 SHA512 91b342c8b0896f5f5e32348118f6a2bc30a4c0e6cd6808e4f510a5982c9d0008e80484a754111553b3249b41a6a5adcbff056ffe62745bc8e958ceab64a6553f WHIRLPOOL 9cc58cfee6ce64fa9d8ed0551ea48f1bc36ca564d5b05c3dfdf29fdc13abcfc6a7ac8be08fa219f7cd188fcc29e884744591ddc006381c6e413cd0bcd892491c
+DIST tokumx-enterprise-2.0.2.tar.gz 16756175 SHA256 2ba471715f399a2652e75a978afde89072fce5560c0813a901a1dadb28582e6b SHA512 8d063abcbe16ce50b5b7f99ae6deec348cf60bb8bb57a3b06e478c03af7ded7501ca6ca15ac63ef07bf3fa0da59a30571b9a799fa5c5a9dcbac741c0a674b1f6 WHIRLPOOL 24546adf1466327571406af41378a15d1ceea58ff92aa01b8f758746cc4b54eabac100710c5bfab53f380f073edf081fc47e5c096df598f96c5e971bdee52805
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 a865fe0..00000000
--- 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/tokumx-2.0.1-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch
deleted file mode 100644
index a67cde5..00000000
--- a/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-2.0.2-boost-57.patch b/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
new file mode 100644
index 00000000..52b3b9f
--- /dev/null
+++ b/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
@@ -0,0 +1,22 @@
+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-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
new file mode 100644
index 00000000..5a0c160
--- /dev/null
+++ b/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
@@ -0,0 +1,88 @@
+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-disable-bundled-libs.patch b/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
deleted file mode 100644
index 66d8db3..00000000
--- 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)
diff --git a/dev-db/tokumx/tokumx-1.5.0-r1.ebuild b/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
deleted file mode 100644
index 837ca80..00000000
--- a/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_BUILD_TYPE=Release
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 cmake-utils
-
-MY_P=${PN}-git-tag-${PV}
-
-DESCRIPTION="An open source, high-performance distribution of MongoDB"
-HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
- dev-libs/jemalloc
- !dev-libs/mongo-cxx-driver
- >=dev-libs/boost-1.50[threads(+)]
- >=dev-libs/libpcre-8.30[cxx]
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- sys-libs/ncurses
- sys-libs/readline"
-
-S="${WORKDIR}/mongo"
-BUILD_DIR="${WORKDIR}/mongo/build"
-QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-Werror.diff"
- epatch "${FILESDIR}/${PN}-disable-bundled-libs.patch"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -D TOKU_DEBUG_PARANOID=OFF
- -D USE_VALGRIND=OFF
- -D USE_BDB=OFF
- -D BUILD_TESTING=OFF
- -D TOKUMX_DISTNAME=${PV}
- -D LIBJEMALLOC="jemalloc"
- -D TOKUMX_STRIP_BINARIES=0
- -D USE_SYSTEM_PCRE=1
- -D USE_SYSTEM_BOOST=1
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Remove unnecessary files
- rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" || die
-
- # Correctly install this python script
- python_foreach_impl python_doscript scripts/tokumxstat.py
-
- # Clean up documentation installed to /usr
- pushd "${D}usr/" || die
- rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
- popd || die
- dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
- newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
-}
diff --git a/dev-db/tokumx/tokumx-1.5.0.ebuild b/dev-db/tokumx/tokumx-1.5.0.ebuild
deleted file mode 100644
index 361adb8..00000000
--- a/dev-db/tokumx/tokumx-1.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils
-
-MY_P=${PN}-git-tag-${PV}
-
-DESCRIPTION="An open source, high-performance distribution of MongoDB"
-HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
- !dev-libs/jemalloc
- !dev-libs/mongo-cxx-driver
- >=dev-libs/boost-1.50[threads(+)]
- >=dev-libs/libpcre-8.30[cxx]
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- sys-libs/ncurses
- sys-libs/readline"
-
-S="${WORKDIR}/mongo"
-BUILD_DIR="${WORKDIR}/mongo/build"
-QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-Werror.diff"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -D TOKU_DEBUG_PARANOID=OFF
- -D USE_VALGRIND=OFF
- -D USE_BDB=OFF
- -D BUILD_TESTING=OFF
- -D TOKUMX_DISTNAME=${PV}
- )
- cmake-utils_src_configure
-}
diff --git a/dev-db/tokumx/tokumx-2.0.1.ebuild b/dev-db/tokumx/tokumx-2.0.2.ebuild
similarity index 68%
rename from dev-db/tokumx/tokumx-2.0.1.ebuild
rename to dev-db/tokumx/tokumx-2.0.2.ebuild
index 70fd171..f9bb49f 100644
--- a/dev-db/tokumx/tokumx-2.0.1.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
CMAKE_BUILD_TYPE=Release
PYTHON_COMPAT=( python2_7 )
inherit python-r1 cmake-utils pax-utils
-MY_P=${PN}-git-tag-${PV}
+MY_P=${PN}-enterprise-${PV}
DESCRIPTION="An open source, high-performance distribution of MongoDB"
-HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.percona.com/software/mongo-database/percona-tokumx"
+SRC_URI="https://www.percona.com/downloads/percona-tokumx/${MY_P}/source/tarball/${MY_P}.tar.gz"
LICENSE="AGPL-3 Apache-2.0"
SLOT="0"
@@ -26,31 +26,33 @@ RDEPEND="
>=dev-libs/libpcre-8.30[cxx]
net-libs/libpcap"
DEPEND="${RDEPEND}
+ dev-util/valgrind
sys-libs/ncurses
sys-libs/readline
pax_kernel? ( sys-apps/paxctl sys-apps/elfix )
"
-S="${WORKDIR}/mongo"
-BUILD_DIR="${WORKDIR}/mongo/build"
+S="${WORKDIR}/${MY_P}"
+#BUILD_DIR="${MY_P}/build"
QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
src_prepare() {
- epatch "${FILESDIR}/${P}-no-werror.patch"
+ eapply "${FILESDIR}/${P}-no-werror.patch"
+ eapply "${FILESDIR}/${P}-boost-57.patch"
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- -D TOKU_DEBUG_PARANOID=OFF
- -D USE_VALGRIND=OFF
- -D USE_BDB=OFF
- -D BUILD_TESTING=OFF
- -D TOKUMX_DISTNAME=${PV}
- -D LIBJEMALLOC="jemalloc"
- -D TOKUMX_STRIP_BINARIES=0
- -D USE_SYSTEM_PCRE=1
- -D USE_SYSTEM_BOOST=1
+ -DTOKU_DEBUG_PARANOID=OFF
+ -DUSE_VALGRIND=OFF
+ -DUSE_BDB=OFF
+ -DBUILD_TESTING=OFF
+ -DTOKUMX_DISTNAME=${PV}
+ -DLIBJEMALLOC="jemalloc"
+ -DTOKUMX_STRIP_BINARIES=0
+ -DUSE_SYSTEM_PCRE=1
+ -DUSE_SYSTEM_BOOST=1
)
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tokumx/, dev-db/tokumx/files/
@ 2018-07-09 9:39 Tony Vroon
0 siblings, 0 replies; 2+ messages in thread
From: Tony Vroon @ 2018-07-09 9:39 UTC (permalink / raw
To: gentoo-commits
commit: 44dd9ff5bceb535331c9c5c4dee596e224f177d0
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 9 09:38:46 2018 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Mon Jul 9 09:38:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44dd9ff5
dev-db/tokumx: Updated patching to avoid GCC 8 final link failure.
Updated patch by Mariusz Ceier to avoid final link failure on GCC 8.
It also seems significantly cleaner. Removing 2.0.2 and bumping up
revision.
Closes: https://bugs.gentoo.org/625158
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/tokumx-2.0.2-undefined-reference.patch | 60 +++++-----------------
...{tokumx-2.0.2.ebuild => tokumx-2.0.2-r1.ebuild} | 1 -
2 files changed, 14 insertions(+), 47 deletions(-)
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
index 012498f7ecd..d56f7745d1e 100644
--- a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
+++ b/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
@@ -1,47 +1,15 @@
-diff -uNr a/src/third_party/backup/copier.cc b/src/third_party/backup/copier.cc
---- a/src/third_party/backup/copier.cc 2018-07-06 12:43:52.698825122 +0200
-+++ b/src/third_party/backup/copier.cc 2018-07-06 12:41:40.066804121 +0200
-@@ -107,10 +107,12 @@
- int r = 0;
- char *fname = 0;
- size_t n_known = 0;
-+ char *dupname;
- {
- with_mutex_locked tm(&m_todo_mutex, BACKTRACE(NULL));
- // Start with "."
-- m_todo.push_back(strdup("."));
-+ dupname = strdup(".");
-+ m_todo.push_back(dupname);
- n_known = m_todo.size();
- }
- while (n_known != 0) {
-@@ -697,6 +699,7 @@
- int error = 0;
- with_mutex_locked tm(&m_todo_mutex, BACKTRACE(NULL));
- struct dirent const *e = NULL;
-+ char *dupname;
- while((e = readdir(dir)) != NULL) {
- if (!the_manager.copy_is_enabled()) break;
- if(is_dot(e)) {
-@@ -716,8 +719,9 @@
- goto out;
- }
-
-+ dupname = strdup(new_name);
- // Add it to our todo list.
-- m_todo.push_back(strdup(new_name));
-+ m_todo.push_back(dupname);
- TRACE("~~~Added this file to todo list:", new_name);
- }
- }
-@@ -730,7 +734,9 @@
- //
- void copier::add_file_to_todo(const char *file) throw() {
- with_mutex_locked tm(&m_todo_mutex, BACKTRACE(NULL));
-- m_todo.push_back(strdup(file));
-+ char *dupname;
-+ dupname = strdup(file);
-+ m_todo.push_back(dupname);
- }
+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/tokumx-2.0.2.ebuild b/dev-db/tokumx/tokumx-2.0.2-r1.ebuild
similarity index 99%
rename from dev-db/tokumx/tokumx-2.0.2.ebuild
rename to dev-db/tokumx/tokumx-2.0.2-r1.ebuild
index 04851a08462..866bdec8d24 100644
--- a/dev-db/tokumx/tokumx-2.0.2.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.2-r1.ebuild
@@ -50,7 +50,6 @@ src_configure() {
local mycmakeargs=(
-DTOKU_DEBUG_PARANOID=OFF
-DUSE_VALGRIND=OFF
- -DUSE_BDB=OFF
-DBUILD_TESTING=OFF
-DTOKUMX_DISTNAME=${PV}
-DLIBJEMALLOC="jemalloc"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-09 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-09 9:39 [gentoo-commits] repo/gentoo:master commit in: dev-db/tokumx/, dev-db/tokumx/files/ Tony Vroon
-- strict thread matches above, loose matches on Subject: below --
2016-11-21 12:24 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox