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

David Tardon dtardon at kemper.freedesktop.org
Fri Apr 15 10:14:27 PDT 2011


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

New commits:
commit c85965707c5ab2a4a20497eb71fdebf00339b52c
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 15 19:14:08 2011 +0200

    register dynamic libs for openssl as well

diff --git a/Repository.mk b/Repository.mk
index cb1e92e..78608dc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -112,11 +112,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	test \
     cppunit \
+    crypto \
     fileacc \
     icui18n \
     icule \
     icuuc \
     rdf \
+    ssl \
     xslt \
 ))
 
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 37e5f6c..39a2332 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -166,6 +166,11 @@ ifeq ($(SYSTEM_LIBXSLT),YES)
 gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
 endif
 
+ifeq ($(SYSTEM_OPENSSL),YES)
+gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
+endif
+
 ifeq ($(SYSTEM_REDLAND),YES)
 gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
 endif


More information about the Libreoffice-commits mailing list