[ooo-build-commit] .: moz/makefile.mk moz/patches

[Caolán McNamara]

 moz/makefile.mk                  |    3 ++-
 moz/patches/brokenmakefile.patch |   13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 4ee9d64e6c914162e6d209299ec33b4e50f5deb0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 11:55:19 2010 +0100

    #i114323# fix broken makefile, won't build under >= f14 otherwise

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) \