fix system boost

Change-Id: Id80557cb47ab471a0f3a643a1c11a59e89c14c54

7 files changed, 10 insertions, 9 deletions

diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 5531606abc86..a2c8d6cb3bbc 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_unpacked,cfgex,boost))
+$(eval $(call gb_Executable_use_external,cfgex,boost_headers))
 
 $(eval $(call gb_Executable_add_scanners,cfgex,\
     l10ntools/source/cfglex \
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index 829a0296939f..a99dc3048b2a 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,gsicheck,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_unpacked,gsicheck,boost))
+$(eval $(call gb_Executable_use_external,gsicheck,boost_headers))
 
 $(eval $(call gb_Executable_add_exception_objects,gsicheck,\
     l10ntools/source/gsicheck \
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index f1d447c92bed..085fd94b9e99 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -35,8 +35,10 @@ $(eval $(call gb_Executable_use_libraries,helpex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_external,helpex,expat_utf8))
-$(eval $(call gb_Executable_use_unpacked,helpex,boost))
+$(eval $(call gb_Executable_use_externals,helpex,\
+	expat_utf8 \
+	boost_headers \
+))
 
 $(eval $(call gb_Executable_use_static_libraries,helpex,\
     transex \
diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index 03699f67a505..064b2078479e 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -18,8 +18,6 @@ $(eval $(call gb_Executable_use_libraries,uiex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_unpacked,uiex,boost))
-
 $(eval $(call gb_Executable_use_static_libraries,uiex,\
     transex \
 ))
@@ -32,6 +30,7 @@ $(eval $(call gb_Executable_use_externals,uiex,\
     libexslt \
     libxml2 \
     libxslt \
+    boost_headers \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index c045eb11e4a9..f0b134ef2264 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_unpacked,ulfex,boost))
+$(eval $(call gb_Executable_use_external,ulfex,boost_headers))
 
 $(eval $(call gb_Executable_use_static_libraries,ulfex,\
     transex \
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index 1aeef2121b7a..3cbcd8861a50 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_unpacked,xrmex,boost))
+$(eval $(call gb_Executable_use_external,xrmex,boost_headers))
 
 $(eval $(call gb_Executable_add_scanners,xrmex,\
     l10ntools/source/xrmlex \
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index da2414ab57f0..4e7780120d1d 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_use_unpacked,transex,boost))
+$(eval $(call gb_StaticLibrary_use_external,transex,boost_headers))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
     l10ntools/source/export2 \