fdo#70393: move boost to a subdir of external

Change-Id: Ib6aa36e296dfc1237463c4257f7ea1bd1fe72a1b
Reviewed-on: https://gerrit.libreoffice.org/6282Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

RepositoryModule_host.mk

@@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	basegfx \
 	basic \
 	bean \
-	$(call gb_Helper_optional,BOOST,boost) \
 	$(call gb_Helper_optional,BSH,beanshell) \
 	binaryurp \
 	bridges \

external/Module_external.mk

@@ -20,6 +20,7 @@ endif
 $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,AFMS,afms) \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
+	$(call gb_Helper_optional,BOOST,boost) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))

boost/Module_boost.mk → external/boost/Module_boost.mk

@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Module_Module,boost))
 
-ifeq ($(SYSTEM_BOOST),NO)
-
 $(eval $(call gb_Module_add_targets,boost,\
 	StaticLibrary_boostdatetime \
 	StaticLibrary_boostsystem \
@@ -23,6 +21,4 @@ $(eval $(call gb_Module_add_targets,boost,\
 ))
 endif
 
-endif # SYSTEM_BOOST
-
 # vim: set noet sw=4 ts=4:

boost/UnpackedTarball_boost.mk → external/boost/UnpackedTarball_boost.mk

@@ -55,7 +55,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,boost,\
-	$(foreach patch,$(boost_patches),boost/$(patch)) \
+	$(foreach patch,$(boost_patches),external/boost/$(patch)) \
 ))
 
 # vim: set noet sw=4 ts=4: