summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2012-09-11 17:47:10 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2012-09-11 17:47:10 +0000
commitce1cf53e96e5a464bdba23697f3bfd4b7977aad7 (patch)
tree0acbe5ac153396fb95809cb5c45ed93b81c3683e /dev-db/mongodb/files
parentStable amd64, bug #434566 (diff)
downloadgentoo-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/files')
-rw-r--r--dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch12
-rw-r--r--dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch13
2 files changed, 13 insertions, 12 deletions
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,