diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2012-09-11 17:47:10 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2012-09-11 17:47:10 +0000 |
| commit | ce1cf53e96e5a464bdba23697f3bfd4b7977aad7 (patch) | |
| tree | 0acbe5ac153396fb95809cb5c45ed93b81c3683e /dev-db/mongodb | |
| parent | Stable amd64, bug #434566 (diff) | |
| download | gentoo-2-ce1cf53e96e5a464bdba23697f3bfd4b7977aad7.tar.gz gentoo-2-ce1cf53e96e5a464bdba23697f3bfd4b7977aad7.tar.bz2 gentoo-2-ce1cf53e96e5a464bdba23697f3bfd4b7977aad7.zip | |
Do not apply client patch on amd64 machines, fix #434664.
(Portage version: 2.1.11.14/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/mongodb')
| -rw-r--r-- | dev-db/mongodb/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch | 12 | ||||
| -rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch | 13 | ||||
| -rw-r--r-- | dev-db/mongodb/mongodb-2.2.0.ebuild | 10 |
4 files changed, 28 insertions, 14 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index 903208587d3c..221a6b67498b 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,11 @@ # 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.44 2012/09/10 12:13:44 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.45 2012/09/11 17:47:10 ultrabug Exp $ + + 11 Sep 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0.ebuild, + files/mongodb-2.2-fix-sconscript.patch, + +files/mongodb-2.2-fix-x86client.patch: + Do not apply client patch on amd64 machines, fix #434664. 10 Sep 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0.ebuild, files/mongodb-2.2-fix-sconscript.patch: 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 f92aaa72508a..43b9db6530dc 100644 --- a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch +++ b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch @@ -9,15 +9,3 @@ 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/files/mongodb-2.2-fix-x86client.patch b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch new file mode 100644 index 000000000000..f289d18da24b --- /dev/null +++ b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch @@ -0,0 +1,13 @@ +diff --git a/src/SConscript.client b/src/SConscript.client +index 7a6bdc9..3fb55e5 100644 +--- 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 9a40ca6926a0..fe626062265f 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.3 2012/09/10 12:13:44 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0.ebuild,v 1.4 2012/09/11 17:47:10 ultrabug Exp $ EAPI=4 SCONS_MIN_VERSION="1.2.0" @@ -49,6 +49,14 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.2-fix-scons.patch" epatch "${FILESDIR}/${PN}-2.2-fix-sconscript.patch" + # FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink + # on amd64 machines [2]. + # [1] https://jira.mongodb.org/browse/SERVER-5575 + # [2] https://bugs.gentoo.org/show_bug.cgi?id=434664 + if [ "$(get_libdir)" == "lib" ]; then + epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch" + fi + sed -e 's@third_party/js-1.7/@/usr/include/js/@g' \ -i src/mongo/scripting/engine_spidermonkey.h \ -i src/mongo/scripting/engine_spidermonkey.cpp || die |