diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-09-17 14:17:32 +0200 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-09-17 14:17:32 +0200 |
| commit | 1041012b7c52fb9ff0ea6ac7eefdb58bdead1b25 (patch) | |
| tree | b48634679903ad0f1c5922fb6fffea52dca190f9 | |
| parent | 7addb339b180ab54baecc0983438c1b9d8fc5e3b (diff) | |
| parent | a7b7be4418c55af90fd5c8440234ed23e85abd08 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes78
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m88
| -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) \ |