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

[Libreoffice Gerrit user]

 external/xmlsec/ExternalPackage_xmlsec.mk |    1 -
 external/xmlsec/ExternalProject_xmlsec.mk |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 22f60a3e0d2a7ca32d14a285f4b50ed318ff7874
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Wed Aug 1 21:15:43 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Thu Aug 2 09:05:38 2018 +0200

    libxmlsec windows: no longer build the mscrypto backend
    
    Only the mscng one is used.
    
    Change-Id: Ic8716cd465b2631da56f47d36811731be205fc3e
    Reviewed-on: https://gerrit.libreoffice.org/58446
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/xmlsec/ExternalPackage_xmlsec.mk b/external/xmlsec/ExternalPackage_xmlsec.mk
index 3ad09e8734df..68ddfaff8cc1 100644
--- a/external/xmlsec/ExternalPackage_xmlsec.mk
+++ b/external/xmlsec/ExternalPackage_xmlsec.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec))
 $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
 
 ifeq ($(OS),WNT)
-$(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-mscng.dll,win32/binaries/libxmlsec-mscng.dll))
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec.dll,win32/binaries/libxmlsec.dll))
 endif
diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk
index 1225df47cf53..d2824344e31c 100644
--- a/external/xmlsec/ExternalProject_xmlsec.mk
+++ b/external/xmlsec/ExternalProject_xmlsec.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_nmake,xmlsec,build))
 
 $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 	$(call gb_ExternalProject_run,build,\
-		cscript /e:javascript configure.js crypto=mscrypto$(COMMA)mscng xslt=no iconv=no static=no \
+		cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \
 			lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
 			$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
 		&& nmake \