[Libreoffice-commits] .: moz/makefile.mk moz/patches

[Michael Stahl]

 moz/makefile.mk                                        |   11 ++++++++++-
 moz/patches/ssl-linux-no_as_needed_linker_option.patch |   10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit e5ac3107e1bef08f619f42c099424a70a9ade281
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Sat Jun 30 20:03:47 2012 +0200

    moz build fixed on Ubuntu
    
    Change-Id: I48a4f43cc2e675d0f72bb7d87893f39f39450488

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 76296ad..f154b95 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,7 +88,8 @@ PATCH_FILES = \
     patches/nss-linux3.patch \
     patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
     patches/clang_missing_this_pointers.patch \
-    patches/seamonkey-1.1.14.source-macosx10.6and7.patch
+    patches/seamonkey-1.1.14.source-macosx10.6and7.patch \
+    patches/ssl-linux-no_as_needed_linker_option.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)
@@ -152,6 +153,14 @@ LDFLAGS+=$(foreach,name,$(echo nspr4 nss3 nssutil3 plc4 plds4) -Wl,-dylib_file,@
 .ENDIF
 .ENDIF
 
+# how can we do it only on Debian/Ubuntu?
+.IF "$(OS)"=="LINUX"
+.IF "$(COM)"=="GCC"
+LDFLAG_NO_AS_NEEDED=-Wl,--no-as-needed
+.EXPORT : LDFLAG_NO_AS_NEEDED
+.ENDIF
+.ENDIF
+
 #disable profilelocking to share profile with mozilla
 #disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h
 #disable gnomevfs to remove the needed of gnome develop files
diff --git a/moz/patches/ssl-linux-no_as_needed_linker_option.patch b/moz/patches/ssl-linux-no_as_needed_linker_option.patch
new file mode 100644
index 0000000..3abce6d
--- /dev/null
+++ b/moz/patches/ssl-linux-no_as_needed_linker_option.patch
@@ -0,0 +1,10 @@
+--- misc/mozilla/security/manager/ssl/src/Makefile.in	2012-06-30 19:47:42.190501730 +0200
++++ misc/build/mozilla/security/manager/ssl/src/Makefile.in	2012-06-30 19:44:08.654510143 +0200
+@@ -137,6 +137,7 @@
+ 		$(MOZ_UNICHARUTIL_LIBS) \
+ 		$(MOZ_COMPONENT_LIBS) \
+ 		$(MOZ_JS_LIBS) \
++		$(LDFLAG_NO_AS_NEEDED) \
+ 		$(NSS_LIBS) \
+ 		$(NULL)
+