summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-09-30 11:55:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-09-30 11:55:19 +0100
commitfb348bddc0a97985b0b72de703ee5271514f0348 (patch)
tree01a9cbfcf9a45adbf3c93eb8fdd9e1fa3e92774d
parent52ca037af1c56b34bbe016f230303bb6264c2bd5 (diff)
#i114323# fix broken makefile, won't build under >= f14 otherwise
-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 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) \