diff options
Diffstat (limited to 'www/firefox/files/patch-bug851992')
| -rw-r--r-- | www/firefox/files/patch-bug851992 | 78 |
1 files changed, 18 insertions, 60 deletions
diff --git a/www/firefox/files/patch-bug851992 b/www/firefox/files/patch-bug851992 index 3185452e2b44..e20d8174136d 100644 --- a/www/firefox/files/patch-bug851992 +++ b/www/firefox/files/patch-bug851992 @@ -79,17 +79,12 @@ diff --git a/configure.in b/configure.in Location of Java binaries (java, javac, jar)], JAVA_BIN_PATH=$withval) diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- js/src/Makefile.in -+++ js/src/Makefile.in -@@ -232,48 +232,54 @@ endif - - ############################################# - # BEGIN ECMAScript Internationalization API - # - +--- js/src/Makefile.in.orig 2013-10-26 00:19:30.000000000 +0200 ++++ js/src/Makefile.in 2013-10-26 12:51:24.469902638 +0200 +@@ -232,12 +232,17 @@ # ICU headers need to be available whether we build with the complete # Internationalization API or not - ICU stubs rely on them. - + +ifdef MOZ_NATIVE_ICU +LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) +else @@ -98,67 +93,33 @@ diff --git a/js/src/Makefile.in b/js/src/Makefile.in -I$(topsrcdir)/../../intl/icu/source/i18n \ $(NULL) +endif - + ifdef ENABLE_INTL_API - ++ifndef MOZ_NATIVE_ICU + ifeq ($(OS_ARCH),WINNT) - # Parallel gmake is buggy on Windows - ICU_GMAKE_OPTIONS="-j1" # Library names: On Windows, ICU uses modified library names for static - # and debug libraries. - ifdef MOZ_DEBUG - ICU_LIB_SUFFIX=d - endif - ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\ - cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;) - endif - -+ifndef MOZ_NATIVE_ICU - # - Build ICU as part of the "export" target, so things get built - # in the right order. - # - ICU requires GNU make according to its readme.html. pymake can't be used - # because it doesn't support order only dependencies. - # - Force ICU to use the standard suffix for object files because expandlibs - # will discard all files with a non-standard suffix (bug 857450). - # - Options for genrb: -k strict parsing; -R omit collation tailoring rules. - export:: - $(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R' - $(ICU_LIB_RENAME) - - distclean clean:: +@@ -271,6 +276,7 @@ $(call SUBMAKE,$@,intl/icu) -+endif - + endif - ++endif + # # END ECMAScript Internationalization API - ############################################# - - -@@ -398,17 +404,21 @@ CFLAGS += $(MOZ_ZLIB_CFLAGS) - EXTRA_LIBS += $(MOZ_ZLIB_LIBS) - # Enable zlib usage if zlib has been located. When building the browser on - # Windows, MOZ_ZLIB_LIBS is empty because zlib is part of libmozglue. We thus - # also enable zlib if mozglue is present. - ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS)) +@@ -394,7 +400,11 @@ DEFINES += -DUSE_ZLIB endif - + -SHARED_LIBRARY_LIBS += $(ICU_LIBS) +ifdef MOZ_NATIVE_ICU +EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) +else +SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) +endif - + # Prevent floating point errors caused by VC++ optimizations ifdef _MSC_VER - # XXX We should add this to CXXFLAGS, too? - CFLAGS += -fp:precise - - ifeq ($(CPU_ARCH),x86) - # Workaround compiler bug on PGO (Bug 721284) diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in --- js/src/config/Makefile.in +++ js/src/config/Makefile.in @@ -206,7 +167,7 @@ diff --git a/js/src/config/system-headers b/js/src/config/system-headers diff --git a/js/src/configure.in b/js/src/configure.in --- js/src/configure.in +++ js/src/configure.in -@@ -4406,59 +4406,68 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE +@@ -4406,56 +4406,65 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION) AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION) fi @@ -226,12 +187,9 @@ diff --git a/js/src/configure.in b/js/src/configure.in + PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) +fi - if test -n "$JS_STANDALONE"; then - ENABLE_INTL_API=1 - fi - MOZ_ARG_ENABLE_BOOL(intl-api, - [ --enable-intl-api Enable ECMAScript Internationalization API (default=yes for standalone JS)], - ENABLE_INTL_API=1, + ENABLE_INTL_API=1 + MOZ_ARG_DISABLE_BOOL(intl-api, + [ --disable-intl-api Disable the ECMAScript Internationalization API], ENABLE_INTL_API= ) dnl Settings for the implementation of the ECMAScript Internationalization API |