From f4aef6b62c614ecd1d50069031eae67318ac5ff9 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 9 Sep 2014 06:16:35 +0000 Subject: 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@ --- www/firefox-esr/files/patch-bug702179 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'www/firefox-esr/files/patch-bug702179') 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 -- cgit v1.2.3