fdo#70393: move libxmlsec to a subdir of external

Change-Id: I1bcdd01aad7fc2ee2d2f635b0ae4c4183c9ab092
Reviewed-on: https://gerrit.libreoffice.org/6571Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -69,7 +69,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	librelogo \
-	libxmlsec \
 	lingucomponent \
 	linguistic \
 	lotuswordpro \

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) \

libxmlsec/Makefile → 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:

libxmlsec/UnpackedTarball_xmlsec.mk → 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