summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bugzilla-535300
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox/files/patch-bugzilla-535300')
-rw-r--r--www/firefox/files/patch-bugzilla-53530020
1 files changed, 20 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bugzilla-535300 b/www/firefox/files/patch-bugzilla-535300
new file mode 100644
index 000000000000..4c0bb136129a
--- /dev/null
+++ b/www/firefox/files/patch-bugzilla-535300
@@ -0,0 +1,20 @@
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
++++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
+@@ -433,7 +433,16 @@
+ #ifdef ANDROID
+ path += "/lib";
+ #endif
+- newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
++ nsCString new_ld_lib_path;
++ if (ld_library_path && *ld_library_path) {
++ new_ld_lib_path.Assign(ld_library_path);
++ new_ld_lib_path.AppendLiteral(":");
++ new_ld_lib_path.Append(path.get());
++ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
++ } else {
++ newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ }
+ #elif OS_MACOSX
+ newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
+ #endif