diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libxmlsec/ExternalPackage_xmlsec.mk (renamed from libxmlsec/ExternalPackage_xmlsec.mk) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/ExternalProject_xmlsec.mk (renamed from libxmlsec/ExternalProject_xmlsec.mk) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/Makefile (renamed from libxmlsec/Makefile) | 2 | ||||
| -rw-r--r-- | external/libxmlsec/Module_libxmlsec.mk (renamed from libxmlsec/Module_libxmlsec.mk) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/README (renamed from libxmlsec/README) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/UnpackedTarball_xmlsec.mk (renamed from libxmlsec/UnpackedTarball_xmlsec.mk) | 44 | ||||
| -rw-r--r-- | external/libxmlsec/include/akmngr_mscrypto.h (renamed from libxmlsec/include/akmngr_mscrypto.h) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/include/akmngr_nss.h (renamed from libxmlsec/include/akmngr_nss.h) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/include/ciphers.h (renamed from libxmlsec/include/ciphers.h) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/include/tokens.h (renamed from libxmlsec/include/tokens.h) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/src/akmngr_mscrypto.c (renamed from libxmlsec/src/akmngr_mscrypto.c) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/src/akmngr_nss.c (renamed from libxmlsec/src/akmngr_nss.c) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/src/keywrapers.c (renamed from libxmlsec/src/keywrapers.c) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/src/tokens.c (renamed from libxmlsec/src/tokens.c) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-1.2.14-ansi.patch (renamed from libxmlsec/xmlsec1-1.2.14-ansi.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch (renamed from libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-android.patch (renamed from libxmlsec/xmlsec1-android.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch (renamed from libxmlsec/xmlsec1-configure-libxml-libxslt.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-configure.patch (renamed from libxmlsec/xmlsec1-configure.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-customkeymanage.patch (renamed from libxmlsec/xmlsec1-customkeymanage.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch (renamed from libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-mingw32.patch (renamed from libxmlsec/xmlsec1-mingw32.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-noverify.patch (renamed from libxmlsec/xmlsec1-noverify.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-nssdisablecallbacks.patch (renamed from libxmlsec/xmlsec1-nssdisablecallbacks.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-nssmangleciphers.patch (renamed from libxmlsec/xmlsec1-nssmangleciphers.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-olderlibxml2.patch (renamed from libxmlsec/xmlsec1-olderlibxml2.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-oldlibtool.patch (renamed from libxmlsec/xmlsec1-oldlibtool.patch) | 0 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch (renamed from libxmlsec/xmlsec1-vc.patch) | 0 |
30 files changed, 24 insertions, 24 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index fb7268d24bb5..f85fe43dd70a 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -69,7 +69,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmaccess \ jvmfwk \ librelogo \ - libxmlsec \ lingucomponent \ linguistic \ lotuswordpro \ diff --git a/external/Module_external.mk b/external/Module_external.mk index f0fae3eca5e5..a7a553d04c5f 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif $(eval $(call gb_Module_add_moduledirs,external,\ + libxmlsec \ np_sdk \ $(call gb_Helper_optional,AFMS,afms) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/external/libxmlsec/ExternalPackage_xmlsec.mk index 06c793863594..06c793863594 100644 --- a/libxmlsec/ExternalPackage_xmlsec.mk +++ b/external/libxmlsec/ExternalPackage_xmlsec.mk diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index dc7989918c1b..dc7989918c1b 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk diff --git a/libxmlsec/Makefile b/external/libxmlsec/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libxmlsec/Makefile +++ b/external/libxmlsec/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/libxmlsec/Module_libxmlsec.mk b/external/libxmlsec/Module_libxmlsec.mk index 3e51e4ace55f..3e51e4ace55f 100644 --- a/libxmlsec/Module_libxmlsec.mk +++ b/external/libxmlsec/Module_libxmlsec.mk diff --git a/libxmlsec/README b/external/libxmlsec/README index 2484bf2300e4..2484bf2300e4 100644 --- a/libxmlsec/README +++ b/external/libxmlsec/README diff --git a/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk index 57008e757fb5..6d1cb4317035 100644 --- a/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk @@ -12,33 +12,33 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) $(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL),,libxmlsec)) $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ - libxmlsec/xmlsec1-configure.patch \ - libxmlsec/xmlsec1-configure-libxml-libxslt.patch \ - libxmlsec/xmlsec1-olderlibxml2.patch \ - libxmlsec/xmlsec1-oldlibtool.patch \ - libxmlsec/xmlsec1-nssdisablecallbacks.patch \ - libxmlsec/xmlsec1-nssmangleciphers.patch \ - libxmlsec/xmlsec1-noverify.patch \ - libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch \ - libxmlsec/xmlsec1-vc.patch \ - libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch \ - libxmlsec/xmlsec1-android.patch \ - libxmlsec/xmlsec1-1.2.14-ansi.patch \ - libxmlsec/xmlsec1-customkeymanage.patch \ + external/libxmlsec/xmlsec1-configure.patch \ + external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch \ + external/libxmlsec/xmlsec1-olderlibxml2.patch \ + external/libxmlsec/xmlsec1-oldlibtool.patch \ + external/libxmlsec/xmlsec1-nssdisablecallbacks.patch \ + external/libxmlsec/xmlsec1-nssmangleciphers.patch \ + external/libxmlsec/xmlsec1-noverify.patch \ + external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch \ + external/libxmlsec/xmlsec1-vc.patch \ + external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch \ + external/libxmlsec/xmlsec1-android.patch \ + external/libxmlsec/xmlsec1-1.2.14-ansi.patch \ + external/libxmlsec/xmlsec1-customkeymanage.patch \ )) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,libxmlsec/include/akmngr_mscrypto.h)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/mscrypto/akmngr.c,libxmlsec/src/akmngr_mscrypto.c)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/akmngr.h,libxmlsec/include/akmngr_nss.h)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/ciphers.h,libxmlsec/include/ciphers.h)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/tokens.h,libxmlsec/include/tokens.h)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/akmngr.c,libxmlsec/src/akmngr_nss.c)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/keywrapers.c,libxmlsec/src/keywrapers.c)) -$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/tokens.c,libxmlsec/src/tokens.c)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,external/libxmlsec/include/akmngr_mscrypto.h)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/mscrypto/akmngr.c,external/libxmlsec/src/akmngr_mscrypto.c)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/akmngr.h,external/libxmlsec/include/akmngr_nss.h)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/ciphers.h,external/libxmlsec/include/ciphers.h)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/tokens.h,external/libxmlsec/include/tokens.h)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/akmngr.c,external/libxmlsec/src/akmngr_nss.c)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/keywrapers.c,external/libxmlsec/src/keywrapers.c)) +$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/tokens.c,external/libxmlsec/src/tokens.c)) ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ - libxmlsec/xmlsec1-mingw32.patch \ + external/libxmlsec/xmlsec1-mingw32.patch \ )) endif diff --git a/libxmlsec/include/akmngr_mscrypto.h b/external/libxmlsec/include/akmngr_mscrypto.h index 57ba811b3934..57ba811b3934 100644 --- a/libxmlsec/include/akmngr_mscrypto.h +++ b/external/libxmlsec/include/akmngr_mscrypto.h diff --git a/libxmlsec/include/akmngr_nss.h b/external/libxmlsec/include/akmngr_nss.h index a6b88301b405..a6b88301b405 100644 --- a/libxmlsec/include/akmngr_nss.h +++ b/external/libxmlsec/include/akmngr_nss.h diff --git a/libxmlsec/include/ciphers.h b/external/libxmlsec/include/ciphers.h index 8088614dee74..8088614dee74 100644 --- a/libxmlsec/include/ciphers.h +++ b/external/libxmlsec/include/ciphers.h diff --git a/libxmlsec/include/tokens.h b/external/libxmlsec/include/tokens.h index c7c0fa1ed500..c7c0fa1ed500 100644 --- a/libxmlsec/include/tokens.h +++ b/external/libxmlsec/include/tokens.h diff --git a/libxmlsec/src/akmngr_mscrypto.c b/external/libxmlsec/src/akmngr_mscrypto.c index af9eef4ecfb6..af9eef4ecfb6 100644 --- a/libxmlsec/src/akmngr_mscrypto.c +++ b/external/libxmlsec/src/akmngr_mscrypto.c diff --git a/libxmlsec/src/akmngr_nss.c b/external/libxmlsec/src/akmngr_nss.c index 0eddf86ef931..0eddf86ef931 100644 --- a/libxmlsec/src/akmngr_nss.c +++ b/external/libxmlsec/src/akmngr_nss.c diff --git a/libxmlsec/src/keywrapers.c b/external/libxmlsec/src/keywrapers.c index 6066724c874b..6066724c874b 100644 --- a/libxmlsec/src/keywrapers.c +++ b/external/libxmlsec/src/keywrapers.c diff --git a/libxmlsec/src/tokens.c b/external/libxmlsec/src/tokens.c index 25c1fb08d0a7..25c1fb08d0a7 100644 --- a/libxmlsec/src/tokens.c +++ b/external/libxmlsec/src/tokens.c diff --git a/libxmlsec/xmlsec1-1.2.14-ansi.patch b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch index 24a9584c9023..24a9584c9023 100644 --- a/libxmlsec/xmlsec1-1.2.14-ansi.patch +++ b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch diff --git a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch index 4d9764549429..4d9764549429 100644 --- a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch +++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch diff --git a/libxmlsec/xmlsec1-android.patch b/external/libxmlsec/xmlsec1-android.patch index 4b81b7c9803c..4b81b7c9803c 100644 --- a/libxmlsec/xmlsec1-android.patch +++ b/external/libxmlsec/xmlsec1-android.patch diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch index c20b8494e28b..c20b8494e28b 100644 --- a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch +++ b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch diff --git a/libxmlsec/xmlsec1-configure.patch b/external/libxmlsec/xmlsec1-configure.patch index 622c0632154c..622c0632154c 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/external/libxmlsec/xmlsec1-configure.patch diff --git a/libxmlsec/xmlsec1-customkeymanage.patch b/external/libxmlsec/xmlsec1-customkeymanage.patch index 1881ea923495..1881ea923495 100644 --- a/libxmlsec/xmlsec1-customkeymanage.patch +++ b/external/libxmlsec/xmlsec1-customkeymanage.patch diff --git a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch index 8c6349a63c5f..8c6349a63c5f 100644 --- a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch +++ b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch diff --git a/libxmlsec/xmlsec1-mingw32.patch b/external/libxmlsec/xmlsec1-mingw32.patch index 879b25c34783..879b25c34783 100644 --- a/libxmlsec/xmlsec1-mingw32.patch +++ b/external/libxmlsec/xmlsec1-mingw32.patch diff --git a/libxmlsec/xmlsec1-noverify.patch b/external/libxmlsec/xmlsec1-noverify.patch index d483cb85bbc7..d483cb85bbc7 100644 --- a/libxmlsec/xmlsec1-noverify.patch +++ b/external/libxmlsec/xmlsec1-noverify.patch diff --git a/libxmlsec/xmlsec1-nssdisablecallbacks.patch b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch index c6ed83a2c54d..c6ed83a2c54d 100644 --- a/libxmlsec/xmlsec1-nssdisablecallbacks.patch +++ b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch diff --git a/libxmlsec/xmlsec1-nssmangleciphers.patch b/external/libxmlsec/xmlsec1-nssmangleciphers.patch index 96f5049f68ae..96f5049f68ae 100644 --- a/libxmlsec/xmlsec1-nssmangleciphers.patch +++ b/external/libxmlsec/xmlsec1-nssmangleciphers.patch diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/external/libxmlsec/xmlsec1-olderlibxml2.patch index f2bd85f5113b..f2bd85f5113b 100644 --- a/libxmlsec/xmlsec1-olderlibxml2.patch +++ b/external/libxmlsec/xmlsec1-olderlibxml2.patch diff --git a/libxmlsec/xmlsec1-oldlibtool.patch b/external/libxmlsec/xmlsec1-oldlibtool.patch index 7d59ce101cce..7d59ce101cce 100644 --- a/libxmlsec/xmlsec1-oldlibtool.patch +++ b/external/libxmlsec/xmlsec1-oldlibtool.patch diff --git a/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch index f996b8b55aa0..f996b8b55aa0 100644 --- a/libxmlsec/xmlsec1-vc.patch +++ b/external/libxmlsec/xmlsec1-vc.patch |