Kaydet (Commit) 6cdf761c authored tarafından Michael Stahl's avatar Michael Stahl

consistent naming of externals: libxmlsec -> xmlsec

Change-Id: I9774dbec91b397d291d8f7f9bf96bbb75fc2baad
Reviewed-on: https://gerrit.libreoffice.org/42298Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 84b0f063
...@@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S ...@@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \ $(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \ $(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \ $(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
LIBXMLSEC_TARBALL \ XMLSEC_TARBALL \
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \ $(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \ $(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
$(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \ $(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
......
...@@ -141,8 +141,8 @@ export LIBLANGTAG_SHA256SUM := d6242790324f1432fb0a6fae71b6851f520b2c5a87675497c ...@@ -141,8 +141,8 @@ export LIBLANGTAG_SHA256SUM := d6242790324f1432fb0a6fae71b6851f520b2c5a87675497c
export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
export LIBTOMMATH_TARBALL := ltm-1.0.zip export LIBTOMMATH_TARBALL := ltm-1.0.zip
export LIBXMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc export XMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz export XMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
export LIBXML_SHA256SUM := 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38 export LIBXML_SHA256SUM := 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
export LIBXML_TARBALL := libxml2-2.9.5.tar.gz export LIBXML_TARBALL := libxml2-2.9.5.tar.gz
export LIBXSLT_SHA256SUM := ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 export LIBXSLT_SHA256SUM := ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
......
...@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals)) ...@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
endif endif
$(eval $(call gb_Module_add_moduledirs,external,\ $(eval $(call gb_Module_add_moduledirs,external,\
$(if $(filter-out IOS,$(OS)),$(call gb_Helper_optional,XMLSEC,libxmlsec)) \ $(if $(filter-out IOS,$(OS)),$(call gb_Helper_optional,XMLSEC,xmlsec)) \
$(call gb_Helper_optional,ABW,libabw) \ $(call gb_Helper_optional,ABW,libabw) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \ $(call gb_Helper_optional,APR,apr) \
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Module_Module,libxmlsec)) $(eval $(call gb_Module_Module,xmlsec))
$(eval $(call gb_Module_add_targets,libxmlsec,\ $(eval $(call gb_Module_add_targets,xmlsec,\
UnpackedTarball_xmlsec \ UnpackedTarball_xmlsec \
ExternalPackage_xmlsec \ ExternalPackage_xmlsec \
ExternalProject_xmlsec \ ExternalProject_xmlsec \
......
...@@ -17,10 +17,10 @@ xmlsec_patches += xmlsec1-mscrypto-fix-signing-regression.patch.1 ...@@ -17,10 +17,10 @@ xmlsec_patches += xmlsec1-mscrypto-fix-signing-regression.patch.1
$(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
$(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL),,libxmlsec)) $(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(XMLSEC_TARBALL),,xmlsec))
$(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
$(foreach patch,$(xmlsec_patches),external/libxmlsec/$(patch)) \ $(foreach patch,$(xmlsec_patches),external/xmlsec/$(patch)) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment