diff options
| -rw-r--r-- | Makefile.fetch | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/Module_external.mk | 2 | ||||
| -rw-r--r-- | external/xmlsec/ExternalPackage_xmlsec.mk (renamed from external/libxmlsec/ExternalPackage_xmlsec.mk) | 0 | ||||
| -rw-r--r-- | external/xmlsec/ExternalProject_xmlsec.mk (renamed from external/libxmlsec/ExternalProject_xmlsec.mk) | 0 | ||||
| -rw-r--r-- | external/xmlsec/Makefile (renamed from external/libxmlsec/Makefile) | 0 | ||||
| -rw-r--r-- | external/xmlsec/Module_xmlsec.mk (renamed from external/libxmlsec/Module_libxmlsec.mk) | 4 | ||||
| -rw-r--r-- | external/xmlsec/README (renamed from external/libxmlsec/README) | 0 | ||||
| -rw-r--r-- | external/xmlsec/UnpackedTarball_xmlsec.mk (renamed from external/libxmlsec/UnpackedTarball_xmlsec.mk) | 4 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 (renamed from external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1) | 0 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-configure.patch.1 (renamed from external/libxmlsec/xmlsec1-configure.patch.1) | 0 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-customkeymanage.patch.1 (renamed from external/libxmlsec/xmlsec1-customkeymanage.patch.1) | 0 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 (renamed from external/libxmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1) | 0 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-vc.patch.1 (renamed from external/libxmlsec/xmlsec1-vc.patch.1) | 0 |
14 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index af57d2f9066c..e0bff2616b99 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \ $(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \ $(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \ - LIBXMLSEC_TARBALL \ + XMLSEC_TARBALL \ $(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \ $(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \ $(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \ diff --git a/download.lst b/download.lst index f59fd67b0337..679a97ab30eb 100644 --- a/download.lst +++ b/download.lst @@ -141,8 +141,8 @@ export LIBLANGTAG_SHA256SUM := d6242790324f1432fb0a6fae71b6851f520b2c5a87675497c export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2 export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 export LIBTOMMATH_TARBALL := ltm-1.0.zip -export LIBXMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc -export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz +export XMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc +export XMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz export LIBXML_SHA256SUM := 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38 export LIBXML_TARBALL := libxml2-2.9.5.tar.gz export LIBXSLT_SHA256SUM := ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 diff --git a/external/Module_external.mk b/external/Module_external.mk index df0fc408a787..de79fb2f7d56 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif $(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,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,APR,apr) \ diff --git a/external/libxmlsec/ExternalPackage_xmlsec.mk b/external/xmlsec/ExternalPackage_xmlsec.mk index e7a38909d825..e7a38909d825 100644 --- a/external/libxmlsec/ExternalPackage_xmlsec.mk +++ b/external/xmlsec/ExternalPackage_xmlsec.mk diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk index a40e9a0b10ee..a40e9a0b10ee 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/xmlsec/ExternalProject_xmlsec.mk diff --git a/external/libxmlsec/Makefile b/external/xmlsec/Makefile index e4968cf85fb6..e4968cf85fb6 100644 --- a/external/libxmlsec/Makefile +++ b/external/xmlsec/Makefile diff --git a/external/libxmlsec/Module_libxmlsec.mk b/external/xmlsec/Module_xmlsec.mk index 7196c02cec9f..55b0a46547a4 100644 --- a/external/libxmlsec/Module_libxmlsec.mk +++ b/external/xmlsec/Module_xmlsec.mk @@ -7,9 +7,9 @@ # 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 \ ExternalPackage_xmlsec \ ExternalProject_xmlsec \ diff --git a/external/libxmlsec/README b/external/xmlsec/README index 2484bf2300e4..2484bf2300e4 100644 --- a/external/libxmlsec/README +++ b/external/xmlsec/README diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk index e07601c594be..0ee75129856f 100644 --- a/external/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/external/xmlsec/UnpackedTarball_xmlsec.mk @@ -17,10 +17,10 @@ xmlsec_patches += xmlsec1-mscrypto-fix-signing-regression.patch.1 $(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,\ - $(foreach patch,$(xmlsec_patches),external/libxmlsec/$(patch)) \ + $(foreach patch,$(xmlsec_patches),external/xmlsec/$(patch)) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 b/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 index 9ff5e52872a9..9ff5e52872a9 100644 --- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 +++ b/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 b/external/xmlsec/xmlsec1-configure.patch.1 index 5d53684a99f9..5d53684a99f9 100644 --- a/external/libxmlsec/xmlsec1-configure.patch.1 +++ b/external/xmlsec/xmlsec1-configure.patch.1 diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 b/external/xmlsec/xmlsec1-customkeymanage.patch.1 index d0984cfc06c1..d0984cfc06c1 100644 --- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 +++ b/external/xmlsec/xmlsec1-customkeymanage.patch.1 diff --git a/external/libxmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 b/external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 index 27c30ba01048..27c30ba01048 100644 --- a/external/libxmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 +++ b/external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/xmlsec/xmlsec1-vc.patch.1 index f84371abb8eb..f84371abb8eb 100644 --- a/external/libxmlsec/xmlsec1-vc.patch.1 +++ b/external/xmlsec/xmlsec1-vc.patch.1 |