diff options
Diffstat (limited to 'mail/thunderbird/patches/patch-ml')
| -rw-r--r-- | mail/thunderbird/patches/patch-ml | 81 |
1 files changed, 25 insertions, 56 deletions
diff --git a/mail/thunderbird/patches/patch-ml b/mail/thunderbird/patches/patch-ml index 208688761ff..f68ea2f886a 100644 --- a/mail/thunderbird/patches/patch-ml +++ b/mail/thunderbird/patches/patch-ml @@ -1,64 +1,33 @@ -$NetBSD: patch-ml,v 1.6 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-ml,v 1.7 2014/07/27 20:04:59 ryoon Exp $ Treat DragonFly like FreeBSD. ---- mozilla/js/src/Makefile.in.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/js/src/Makefile.in.orig 2014-07-18 00:05:24.000000000 +0000 +++ mozilla/js/src/Makefile.in -@@ -237,10 +237,14 @@ endif - # 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 - LOCAL_INCLUDES += \ - -I$(topsrcdir)/../../intl/icu/source/common \ - -I$(topsrcdir)/../../intl/icu/source/i18n \ - $(NULL) -+endif - - ifdef ENABLE_INTL_API - -@@ -260,6 +264,7 @@ else - ICU_MAKE = $(MAKE) - 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 -@@ -274,6 +279,7 @@ export:: - - distclean clean:: - $(call SUBMAKE,$@,intl/icu) -+endif - +@@ -20,8 +20,6 @@ run_for_side_effects := $(shell echo 'MA + STATIC_LIBRARY_NAME = js_static + LIBS = $(NSPR_LIBS) + +-DIST_INSTALL = 1 +- + ifdef JS_STANDALONE + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) endif - -@@ -413,7 +419,11 @@ ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLA - DEFINES += -DUSE_ZLIB +@@ -226,7 +224,7 @@ endif + ifdef MOZ_SHARED_ICU + EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) + else +-SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) ++SHARED_LIBRARY_LIBS += $(filter-out -L% -l% -Wl%,$(MOZ_ICU_LIBS)) 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 -@@ -472,6 +482,13 @@ EXTRA_LIBS += -lposix4 -ldl -lnsl -lsock - endif - endif - -+# clang 3.3 + -O2 makes jaeger crash in FixupArity -+ifdef CLANG_CXX -+ifndef MOZ_DEBUG -+Compiler.$(OBJ_SUFFIX): CXXFLAGS += -fno-inline-functions -+endif -+endif -+ - # An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result. - # This suppresses optimization for this single compilation unit. - ifeq ($(OS_ARCH),AIX) +@@ -350,7 +348,7 @@ endif + + ifdef HAVE_DTRACE + $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d +- dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in ++ dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in + sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ + -e '/const/!s/char \*/const char */g' \ + javascript-trace.h.in > javascript-trace.h |