diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-12-13 11:06:14 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-12-13 11:06:14 +0100 |
| commit | d9172015d263ca161ff0439263ccc2590678ed6b (patch) | |
| tree | 0e4eac1175f8b0efd8d22f6ff11020e1af6bd606 /moz | |
| parent | bfbdc24a6f67056323723b805cd5fa98e30321bc (diff) | |
| parent | 7193ff6602780443d0c0b6ec8dac057db6983e4d (diff) | |
Update from master repository (DEV300_m95).
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 3 | ||||
| -rw-r--r-- | moz/patches/brokenmakefile.patch | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 9629f7138b74..feb2c50343ee 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -86,7 +86,8 @@ PATCH_FILES = \ patches/dtoa.patch \ patches/respect_disable_pango.patch \ patches/arm_build_fix.patch \ - patches/link_fontconfig.patch + patches/link_fontconfig.patch \ + patches/brokenmakefile.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/brokenmakefile.patch b/moz/patches/brokenmakefile.patch new file mode 100644 index 000000000000..20d88014b932 --- /dev/null +++ b/moz/patches/brokenmakefile.patch @@ -0,0 +1,13 @@ +--- misc/mozilla/mailnews/extensions/smime/build/Makefile.in 2010-09-04 16:00:38.000000000 +0100 ++++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in 2010-09-04 16:02:24.000000000 +0100 +@@ -79,10 +79,6 @@ + $(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \ + $(NULL) + +-ifndef MOZ_STATIC_MAIL_BUILD +-SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) +-endif +- + EXTRA_DSO_LDOPTS = \ + $(LIBS_DIR) \ + $(EXTRA_DSO_LIBS) \ |