diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2015-08-03 10:30:44 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2015-08-03 10:30:44 +0000 |
| commit | 7ceca387ae01ae39ffdcbf41d7307baea1682dd2 (patch) | |
| tree | 30fdb7359157617c13c7501f79de989f84e408ff /dev-db | |
| parent | Version bump (diff) | |
| download | gentoo-2-7ceca387ae01ae39ffdcbf41d7307baea1682dd2.tar.gz gentoo-2-7ceca387ae01ae39ffdcbf41d7307baea1682dd2.tar.bz2 gentoo-2-7ceca387ae01ae39ffdcbf41d7307baea1682dd2.zip | |
fix #556272 build with boost-1.57 thx to Uros
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mongodb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch | 13 | ||||
| -rw-r--r-- | dev-db/mongodb/mongodb-2.6.10.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index 8d13942ec66d..c5bb419a3aab 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.121 2015/06/16 21:20:42 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.122 2015/08/03 10:30:44 ultrabug Exp $ + + 03 Aug 2015; Ultrabug <ultrabug@gentoo.org> mongodb-2.6.10.ebuild, + +files/mongodb-2.6.10-fix-boost-1.57.patch: + fix #556272 build with boost-1.57 thx to Uros *mongodb-3.0.4 (16 Jun 2015) diff --git a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch b/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch new file mode 100644 index 000000000000..5f289c078831 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch @@ -0,0 +1,13 @@ +diff -up mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h\~ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h +--- mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h~ 2015-01-13 18:12:06.000000000 +0100 ++++ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h 2015-01-28 22:22:50.538934558 +0100 +@@ -17,6 +17,7 @@ + + #include <boost/smart_ptr/scoped_array.hpp> + #include <string.h> ++#include <algorithm> + + namespace linenoise_utf8 { + + +Diff finished. Wed Jan 28 22:24:47 2015 diff --git a/dev-db/mongodb/mongodb-2.6.10.ebuild b/dev-db/mongodb/mongodb-2.6.10.ebuild index 2d73080dd2e0..d919792084f4 100644 --- a/dev-db/mongodb/mongodb-2.6.10.ebuild +++ b/dev-db/mongodb/mongodb-2.6.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.10.ebuild,v 1.2 2015/05/27 12:49:37 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.10.ebuild,v 1.3 2015/08/03 10:30:44 ultrabug Exp $ EAPI=5 SCONS_MIN_VERSION="1.2.0" @@ -74,6 +74,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/${PN}-2.6.2-fix-scons.patch" epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch" + epatch "${FILESDIR}/${PN}-2.6.10-fix-boost-1.57.patch" # fix yaml-cpp detection sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die |