aboutsummaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2011-06-28 16:42:58 +0000
committerFlorian Smeets <flo@FreeBSD.org>2011-06-28 16:42:58 +0000
commitc1e827f9553bb9a04f04f3384369a146e65b0cb3 (patch)
tree68126e954d7beb6d54c708c9e6a99e2abdc9673f /www/firefox
parentdfadc9fbca9983efff202af4f1c19c2430314787 (diff)
downloadports-c1e827f9553bb9a04f04f3384369a146e65b0cb3.tar.gz
ports-c1e827f9553bb9a04f04f3384369a146e65b0cb3.zip
Notes
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/files/patch-bugzilla-53530020
-rw-r--r--www/firefox/files/patch-configure.in15
2 files changed, 35 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
diff --git a/www/firefox/files/patch-configure.in b/www/firefox/files/patch-configure.in
index d36a535358ab..103defe63c68 100644
--- a/www/firefox/files/patch-configure.in
+++ b/www/firefox/files/patch-configure.in
@@ -69,3 +69,18 @@
SunOS:x86)
VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
++ FreeBSD:i386)
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ ;;
+ SunOS:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1