summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug702179
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-09-09 06:16:35 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-09-09 06:16:35 +0000
commitf4aef6b62c614ecd1d50069031eae67318ac5ff9 (patch)
tree781de0366f06f8728245988a38a42d4e172d024d /www/firefox-esr/files/patch-bug702179
parentwww/ruybgem-puma: update to 2.9.1 (diff)
Mozilla upgrades:
- Update nspr to 4.10.7 - Update ca_root_nss to 3.17 (mark as NO_ARCH while here) - Update firefox to 32.0 - Update thunderbird to 31.1.0 - Add net-im/linux-instantbird - Update firefox-est to 31.1.0 - Update libxul to 24.8.0 - Update seamonkey to 2.29 Submitted by: Jan Beich for gecko@
Diffstat (limited to 'www/firefox-esr/files/patch-bug702179')
-rw-r--r--www/firefox-esr/files/patch-bug70217915
1 files changed, 8 insertions, 7 deletions
diff --git a/www/firefox-esr/files/patch-bug702179 b/www/firefox-esr/files/patch-bug702179
index 5754b607ad57..d7b90a082519 100644
--- a/www/firefox-esr/files/patch-bug702179
+++ b/www/firefox-esr/files/patch-bug702179
@@ -25,11 +25,12 @@ diff --git js/src/Makefile.in js/src/Makefile.in
index e28160a..28ca5e8 100644
--- js/src/Makefile.in
+++ js/src/Makefile.in
-@@ -35,7 +35,6 @@ ifdef JS_SHARED_LIBRARY
- FORCE_SHARED_LIB = 1
- endif
- FORCE_STATIC_LIB = 1
--DIST_INSTALL = 1
+@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
+ STATIC_LIBRARY_NAME = js_static
+ LIBS = $(NSPR_LIBS)
- ###############################################
- # BEGIN include sources for low-level code shared with mfbt
+-DIST_INSTALL = 1
+-
+ ifdef JS_STANDALONE
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
+ ifndef MOZ_NATIVE_ZLIB