fdo#70393: move openssl to a subdir of external

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

RepositoryModule_host.mk

@@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	officecfg \
 	oovbaapi \
 	oox \
-	$(call gb_Helper_optional,OPENSSL,openssl) \
 	package \
 	padmin \
 	$(call gb_Helper_optional,POPPLER,poppler) \

external/Module_external.mk

@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,NSS,nss) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
+	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \

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

openssl/UnpackedTarball_openssl.mk → external/openssl/UnpackedTarball_openssl.mk

@@ -91,11 +91,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-	$(if $(filter LINUX FREEBSD ANDROID,$(OS)),openssl/openssllnx.patch) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),openssl/opensslmingw.patch) \
-	$(if $(filter MSC,$(COM)),openssl/opensslwnt.patch) \
-	$(if $(filter SOLARIS,$(OS)),openssl/opensslsol.patch) \
-	$(if $(filter IOS,$(OS)),openssl/opensslios.patch) \
+	$(if $(filter LINUX FREEBSD ANDROID,$(OS)),external/openssl/openssllnx.patch) \
+	$(if $(filter WNTGCC,$(OS)$(COM)),external/openssl/opensslmingw.patch) \
+	$(if $(filter MSC,$(COM)),external/openssl/opensslwnt.patch) \
+	$(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \
+	$(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \
 ))
 
 # vim: set noet sw=4 ts=4: