summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-09-17 14:17:32 +0200
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-09-17 14:17:32 +0200
commit67721e584ce33cda1fdf9a839000c0cf03294b6e (patch)
treec8d5f805554ee8580c27c5b156428bb2656ac735
parenteaa9aa0d28fab58a115600d583fc68b4ec2a85be (diff)
parent3dff68d1e5b2eb1d5030945d960ef60f4469a868 (diff)
CWS-TOOLING: integrate CWS cmcfixes78ooo/DEV300_m88
-rw-r--r--moz/makefile.mk3
-rw-r--r--moz/patches/brokenmakefile.patch13
2 files changed, 15 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 9629f71..feb2c50 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 0000000..20d8801
--- /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) \