[Libreoffice-commits] .: 2 commits - RepositoryFixes.mk Repository.mk

[David Tardon]

 Repository.mk      |    2 ++
 RepositoryFixes.mk |    7 +++++++
 2 files changed, 9 insertions(+)

New commits:
commit 2bb704cb1b8d2b9472fc95cd81cda9bfbafb3c7f
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 15 16:15:27 2011 +0200

    mangle openssl lib names on WNT with GCC
    
    I hope I got it right...

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index c9bce7d..37e5f6c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -135,6 +135,13 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 endif
 
+# TODO: is this correct? This is how I parsed the conditionals in
+# oox/util/makefile.mk .-)
+ifeq ($(COM),GCC)
+gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
+endif
+
 endif
 
 ifeq ($(OS),SOLARIS)
commit 0af7b8023b86755545a8814246e35b425e4bdefc
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 15 16:14:31 2011 +0200

    declare internal static openssl libs

diff --git a/Repository.mk b/Repository.mk
index 19a59d3..cb1e92e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -153,9 +153,11 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    crypto \
     jpeglib \
     ooopathutils \
     salcpprt \
+    ssl \
     vclmain \
     zlib \
 ))