diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2012-09-10 12:13:45 +0000 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2012-09-10 12:13:45 +0000 |
commit | ab320d710109287372f39b447c928f861b9a701c (patch) | |
tree | 569b1079aeb4ddba52179724ca2d37f6a3e2208f /dev-db | |
parent | Remove old. (diff) | |
download | gentoo-2-ab320d710109287372f39b447c928f861b9a701c.tar.gz gentoo-2-ab320d710109287372f39b447c928f861b9a701c.tar.bz2 gentoo-2-ab320d710109287372f39b447c928f861b9a701c.zip |
Fix #433533 RDEPEND thx to Albert W. Hopkins. Fix x86 compilation #433507.
(Portage version: 2.1.11.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mongodb/ChangeLog | 6 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch | 12 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-2.2.0.ebuild | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index b900c2727035..903208587d3c 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.43 2012/08/30 15:47:24 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.44 2012/09/10 12:13:44 ultrabug Exp $ + + 10 Sep 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0.ebuild, + files/mongodb-2.2-fix-sconscript.patch: + Fix #433533 RDEPEND thx to Albert W. Hopkins. Fix x86 compilation #433507. 30 Aug 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0.ebuild: Fix v8 compilation when spidermonkey is not installed, by Jouni Kosonen. diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch index 43b9db6530dc..f92aaa72508a 100644 --- a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch +++ b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch @@ -9,3 +9,15 @@ elif usev8: env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp', 'scripting/v8_db.cpp', + +--- a/src/SConscript.client ++++ b/src/SConscript.client +@@ -134,7 +134,7 @@ env.Install( + # install + prefix = GetOption("prefix") + +-env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}') ++env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}') + + for x in clientHeaderDirectories: + env.Install(prefix + "/include/mongo/" + x, diff --git a/dev-db/mongodb/mongodb-2.2.0.ebuild b/dev-db/mongodb/mongodb-2.2.0.ebuild index 4b02d79dc5d5..9a40ca6926a0 100644 --- a/dev-db/mongodb/mongodb-2.2.0.ebuild +++ b/dev-db/mongodb/mongodb-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0.ebuild,v 1.2 2012/08/30 15:47:24 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0.ebuild,v 1.3 2012/09/10 12:13:44 ultrabug Exp $ EAPI=4 SCONS_MIN_VERSION="1.2.0" @@ -24,10 +24,10 @@ RDEPEND="!v8? ( <dev-lang/spidermonkey-1.8[unicode] ) v8? ( dev-lang/v8 ) dev-libs/boost dev-libs/libpcre[cxx] + dev-util/google-perftools net-libs/libpcap app-arch/snappy" DEPEND="${RDEPEND} - dev-util/google-perftools sys-libs/readline sys-libs/ncurses" |