mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libxmlsec: stop delivering static and import libraries

Browse Source 
... and also check COM instead of CROSS_COMPILING.

Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c
This commit is contained in:
Michael Stahl
2013-10-01 00:06:38 +02:00
parent 2df9a25563
commit cb177b6d79
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Repository.mk
View File

@@ -652,12 +652,15 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1 \ xmlsec1 \
xmlsec1-nss \
)) ))
ifneq ($(CROSS_COMPILING),YES) ifeq ($(COM),MSC)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1-mscrypto \ xmlsec1-mscrypto \
)) ))
else
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1-nss \
))
endif endif
endif endif

12
libxmlsec/ExternalPackage_xmlsec.mk
View File

@@ -13,24 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifeq ($(COM),GCC) ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
else else
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll))
endif endif
else ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
ifneq ($(DISABLE_OPENSSL),YES)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a))
endif # DISABLE_OPENSSL
else
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

24
xmlsecurity/Library_xsec_xmlsec.mk
View File

@@ -70,15 +70,16 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \ xmlsecurity/source/xmlsec/nss/xsec_nss \
)) ))
ifeq ($(OS)$(CROSS_COMPILING),WNT) ifeq ($(OS)-$(COM),WNT-MSC)
$(eval $(call gb_Library_add_defs,xsec_xmlsec,\ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_MSCRYPTO \ -DXMLSEC_CRYPTO_MSCRYPTO \
)) ))
$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
xmlsec1 \ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
xmlsec1-mscrypto \ $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscrypto.lib \
$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
)) ))
$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ $(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\
@@ -103,10 +104,15 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_NSS \ -DXMLSEC_CRYPTO_NSS \
)) ))
ifeq ($(OS)$(CROSS_COMPILING),WNTYES) ifeq ($(OS)-$(COM),WNT-GCC)
$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
xmlsec1 \ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.dll.a \
xmlsec1-nss \ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.dll.a \
))
else ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
$(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \
$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
)) ))
else else
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
@@ -130,7 +136,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \ xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
)) ))
endif # ifeq ($(OS)$(CROSS_COMPILING),WNT) endif # ifeq ($(OS)-$(COM),WNT-GCC)
ifeq ($(OS),SOLARIS) ifeq ($(OS),SOLARIS)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\