fdo#70393: move boost to a subdir of external

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

35 files changed, 2 insertions, 6 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a4ad804f70d6..dccdb4d0c87d 100644
--- a/RepositoryModule_host.mk
+++ b/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 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2aca373c3363..627b4243cefe 100644
--- a/external/Module_external.mk
+++ b/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) \
 ))
diff --git a/boost/Makefile b/external/boost/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/boost/Makefile
+++ b/external/boost/Makefile
diff --git a/boost/Module_boost.mk b/external/boost/Module_boost.mk
index 9274e4ad52b4..1a21a770476d 100644
--- a/boost/Module_boost.mk
+++ b/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:
diff --git a/boost/README b/external/boost/README
index 7e6426bf939b..7e6426bf939b 100644
--- a/boost/README
+++ b/external/boost/README
diff --git a/boost/StaticLibrary_boostdatetime.mk b/external/boost/StaticLibrary_boostdatetime.mk
index bea82da1cf31..bea82da1cf31 100644
--- a/boost/StaticLibrary_boostdatetime.mk
+++ b/external/boost/StaticLibrary_boostdatetime.mk
diff --git a/boost/StaticLibrary_boostsystem.mk b/external/boost/StaticLibrary_boostsystem.mk
index 053321b3f02f..053321b3f02f 100644
--- a/boost/StaticLibrary_boostsystem.mk
+++ b/external/boost/StaticLibrary_boostsystem.mk
diff --git a/boost/StaticLibrary_boostthread.mk b/external/boost/StaticLibrary_boostthread.mk
index 41b6765e2da3..41b6765e2da3 100644
--- a/boost/StaticLibrary_boostthread.mk
+++ b/external/boost/StaticLibrary_boostthread.mk
diff --git a/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 047fbeac15d2..777a8c4417eb 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/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:
diff --git a/boost/boost.3780.aliasing.patch b/external/boost/boost.3780.aliasing.patch
index d9cff1b7aa99..d9cff1b7aa99 100644
--- a/boost/boost.3780.aliasing.patch
+++ b/external/boost/boost.3780.aliasing.patch
diff --git a/boost/boost.4100.warnings.patch b/external/boost/boost.4100.warnings.patch
index ea475777c7f2..ea475777c7f2 100644
--- a/boost/boost.4100.warnings.patch
+++ b/external/boost/boost.4100.warnings.patch
diff --git a/boost/boost.4510.warnings.patch b/external/boost/boost.4510.warnings.patch
index 11fdaceef1e2..11fdaceef1e2 100644
--- a/boost/boost.4510.warnings.patch
+++ b/external/boost/boost.4510.warnings.patch
diff --git a/boost/boost.4713.warnings.patch b/external/boost/boost.4713.warnings.patch
index 7a5726e032fd..7a5726e032fd 100644
--- a/boost/boost.4713.warnings.patch
+++ b/external/boost/boost.4713.warnings.patch
diff --git a/boost/boost.6142.warnings.patch.1 b/external/boost/boost.6142.warnings.patch.1
index b38efd90d16e..b38efd90d16e 100644
--- a/boost/boost.6142.warnings.patch.1
+++ b/external/boost/boost.6142.warnings.patch.1
diff --git a/boost/boost.6369.warnings.patch b/external/boost/boost.6369.warnings.patch
index 81a5eac655a5..81a5eac655a5 100644
--- a/boost/boost.6369.warnings.patch
+++ b/external/boost/boost.6369.warnings.patch
diff --git a/boost/boost.6397.warnings.patch b/external/boost/boost.6397.warnings.patch
index 1cb18d468fb2..1cb18d468fb2 100644
--- a/boost/boost.6397.warnings.patch
+++ b/external/boost/boost.6397.warnings.patch
diff --git a/boost/boost.7551.unusedvars.patch b/external/boost/boost.7551.unusedvars.patch
index a80d4a14e914..a80d4a14e914 100644
--- a/boost/boost.7551.unusedvars.patch
+++ b/external/boost/boost.7551.unusedvars.patch
diff --git a/boost/boost.auto_link.patch b/external/boost/boost.auto_link.patch
index 556d14e0feea..556d14e0feea 100644
--- a/boost/boost.auto_link.patch
+++ b/external/boost/boost.auto_link.patch
diff --git a/boost/boost.endian.patch b/external/boost/boost.endian.patch
index 14505e0b3e52..14505e0b3e52 100644
--- a/boost/boost.endian.patch
+++ b/external/boost/boost.endian.patch
diff --git a/boost/boost.gcc47679.patch b/external/boost/boost.gcc47679.patch
index e62a874c1bfc..e62a874c1bfc 100644
--- a/boost/boost.gcc47679.patch
+++ b/external/boost/boost.gcc47679.patch
diff --git a/boost/boost.libcdr.warnings.patch.1 b/external/boost/boost.libcdr.warnings.patch.1
index 22888c464b7a..22888c464b7a 100644
--- a/boost/boost.libcdr.warnings.patch.1
+++ b/external/boost/boost.libcdr.warnings.patch.1
diff --git a/boost/boost.loplugin.patch b/external/boost/boost.loplugin.patch
index 7c35d33034bd..7c35d33034bd 100644
--- a/boost/boost.loplugin.patch
+++ b/external/boost/boost.loplugin.patch
diff --git a/boost/boost.std.move.patch b/external/boost/boost.std.move.patch
index 83badae6c60a..83badae6c60a 100644
--- a/boost/boost.std.move.patch
+++ b/external/boost/boost.std.move.patch
diff --git a/boost/boost.transform_width.patch b/external/boost/boost.transform_width.patch
index 747a17db13de..747a17db13de 100644
--- a/boost/boost.transform_width.patch
+++ b/external/boost/boost.transform_width.patch
diff --git a/boost/boost.vc2012.patch b/external/boost/boost.vc2012.patch
index ac206997dbbb..ac206997dbbb 100644
--- a/boost/boost.vc2012.patch
+++ b/external/boost/boost.vc2012.patch
diff --git a/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index dd3ce71b910d..dd3ce71b910d 100644
--- a/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
diff --git a/boost/boost.wdeprecated-register.patch.0 b/external/boost/boost.wdeprecated-register.patch.0
index d11de3a817ed..d11de3a817ed 100644
--- a/boost/boost.wdeprecated-register.patch.0
+++ b/external/boost/boost.wdeprecated-register.patch.0
diff --git a/boost/boost.windows.patch b/external/boost/boost.windows.patch
index befc805d5753..befc805d5753 100644
--- a/boost/boost.windows.patch
+++ b/external/boost/boost.windows.patch
diff --git a/boost/boost.wshadow.patch b/external/boost/boost.wshadow.patch
index d27feaca9bcc..d27feaca9bcc 100644
--- a/boost/boost.wshadow.patch
+++ b/external/boost/boost.wshadow.patch
diff --git a/boost/boost.wundef.patch b/external/boost/boost.wundef.patch
index d4538146485a..d4538146485a 100644
--- a/boost/boost.wundef.patch
+++ b/external/boost/boost.wundef.patch
diff --git a/boost/boost.wuninitialized.patch b/external/boost/boost.wuninitialized.patch
index 1b6384e3e7fa..1b6384e3e7fa 100644
--- a/boost/boost.wuninitialized.patch
+++ b/external/boost/boost.wuninitialized.patch
diff --git a/boost/boost.wunused.patch b/external/boost/boost.wunused.patch
index ddffa045ba29..ddffa045ba29 100644
--- a/boost/boost.wunused.patch
+++ b/external/boost/boost.wunused.patch
diff --git a/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch
index 0ab163617069..0ab163617069 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/external/boost/boost_1_44_0-clang-warnings.patch
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/external/boost/boost_1_44_0-gcc4.8.patch
index 700e2ff98bc5..700e2ff98bc5 100644
--- a/boost/boost_1_44_0-gcc4.8.patch
+++ b/external/boost/boost_1_44_0-gcc4.8.patch
diff --git a/boost/boost_1_44_0-unused-parameters.patch b/external/boost/boost_1_44_0-unused-parameters.patch
index 4fe61bac6959..4fe61bac6959 100644
--- a/boost/boost_1_44_0-unused-parameters.patch
+++ b/external/boost/boost_1_44_0-unused-parameters.patch