[Libreoffice-commits] core.git: external/libxmlsec

Miklos Vajna vmiklos at collabora.co.uk
Fri Jun 9 08:03:58 UTC 2017


 external/libxmlsec/ExternalPackage_xmlsec.mk |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 10ea757b0d10826034c4602b8d1caf717129124f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jun 9 09:07:40 2017 +0200

    external: drop mingw bits from ExternalPackage_xmlsec
    
    Change-Id: Icd0526c0bf0183b80bc4c098e3307574b8b8bb8b
    Reviewed-on: https://gerrit.libreoffice.org/38592
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/external/libxmlsec/ExternalPackage_xmlsec.mk b/external/libxmlsec/ExternalPackage_xmlsec.mk
index 06c793863594..e7a38909d825 100644
--- a/external/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/external/libxmlsec/ExternalPackage_xmlsec.mk
@@ -12,13 +12,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec))
 $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
 
 ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
-else
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec.dll,win32/binaries/libxmlsec.dll))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list