gbuild: do not copy boost headers around

- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9

33 files changed, 70 insertions, 2 deletions

diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index 082ea8c53e9f..a3fabd1615a9 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -8,6 +8,8 @@
 #
 $(eval $(call gb_CppunitTest_CppunitTest,filter_pict_test))
 
+$(eval $(call gb_CppunitTest_use_external,filter_pict_test,boost_headers))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \
     filter/qa/cppunit/filters-pict-test \
 ))
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 2829dbd17005..53725bbb257c 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,filter_tga_test))
 
+$(eval $(call gb_CppunitTest_use_external,filter_tga_test,boost_headers))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,filter_tga_test, \
     filter/qa/cppunit/filters-tga-test \
 ))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 1fe899c228a9..bbc257a10403 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,filter_tiff_test))
 
+$(eval $(call gb_CppunitTest_use_external,filter_tiff_test,boost_headers))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,filter_tiff_test, \
     filter/qa/cppunit/filters-tiff-test \
 ))
diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index ca0b39b4ddd5..59ae87bd92c5 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Executable_Executable,svg2odf))
 
 $(eval $(call gb_Executable_set_targettype_gui,svg2odf,YES))
 
+$(eval $(call gb_Executable_use_external,svg2odf,boost_headers))
+
 $(eval $(call gb_Executable_use_sdk_api,svg2odf))
 
 $(eval $(call gb_Executable_set_include,svg2odf,\
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
index f45d61f06b37..59dd7682d152 100644
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,egi))
 
+$(eval $(call gb_Library_use_external,egi,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,egi))
 
 $(eval $(call gb_Library_set_include,egi,\
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
index 8d32f2f6a0de..a62f16a0ce1c 100644
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,eme))
 
+$(eval $(call gb_Library_use_external,eme,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,eme))
 
 $(eval $(call gb_Library_set_include,eme,\
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
index 84e7bc67a18a..1e9bd20a716c 100644
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,epb))
 
+$(eval $(call gb_Library_use_external,epb,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,epb))
 
 $(eval $(call gb_Library_set_include,epb,\
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
index 268fd8f2efcb..4a97a0000f4b 100644
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,epg))
 
+$(eval $(call gb_Library_use_external,epg,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,epg))
 
 $(eval $(call gb_Library_set_include,epg,\
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
index 3c16074597e5..bd9c4d9d4dab 100644
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,epp))
 
+$(eval $(call gb_Library_use_external,epp,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,epp))
 
 $(eval $(call gb_Library_set_include,epp,\
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index ac699afba778..664ccef1766b 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,eps))
 
+$(eval $(call gb_Library_use_external,eps,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,eps))
 
 $(eval $(call gb_Library_set_include,eps,\
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
index c8229c1b5836..9f0a442db78e 100644
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ept))
 
+$(eval $(call gb_Library_use_external,ept,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ept))
 
 $(eval $(call gb_Library_set_include,ept,\
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
index d5e2ed5f1bc9..3a963a1dd4b0 100644
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,era))
 
+$(eval $(call gb_Library_use_external,era,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,era))
 
 $(eval $(call gb_Library_set_include,era,\
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
index 47f113f570cf..9f934f68eb33 100644
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,eti))
 
+$(eval $(call gb_Library_use_external,eti,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,eti))
 
 $(eval $(call gb_Library_set_include,eti,\
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
index d2c184bd84b5..628e636e4618 100644
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,exp))
 
+$(eval $(call gb_Library_use_external,exp,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,exp))
 
 $(eval $(call gb_Library_set_include,exp,\
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 0b7b047c2946..1a2af91e9f38 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,filterconfig))
 
 $(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
 
+$(eval $(call gb_Library_use_external,filterconfig,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,filterconfig))
 
 $(eval $(call gb_Library_set_include,filterconfig,\
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 1f309090c6ad..97dd310905b1 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -41,7 +41,10 @@ $(eval $(call gb_Library_use_libraries,flash,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_externals,flash,zlib))
+$(eval $(call gb_Library_use_externals,flash,\
+	boost_headers \
+	zlib \
+))
 
 $(eval $(call gb_Library_add_exception_objects,flash,\
 	filter/source/flash/impswfdialog \
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
index 29080f54c83e..bc4ec54a3465 100644
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,icd))
 
+$(eval $(call gb_Library_use_external,icd,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,icd))
 
 $(eval $(call gb_Library_set_include,icd,\
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index 21bd077522f7..43362ad2865b 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,icg))
 
+$(eval $(call gb_Library_use_external,icg,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,icg))
 
 $(eval $(call gb_Library_set_include,icg,\
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
index 0ec557d89a90..69b1cd73cc95 100644
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,idx))
 
+$(eval $(call gb_Library_use_external,idx,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,idx))
 
 $(eval $(call gb_Library_set_include,idx,\
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
index 1fa0bae70f24..f7a37cc15f2c 100644
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ime))
 
+$(eval $(call gb_Library_use_external,ime,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ime))
 
 $(eval $(call gb_Library_set_include,ime,\
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
index a50df6f042f9..a972a53b898a 100644
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ipb))
 
+$(eval $(call gb_Library_use_external,ipb,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ipb))
 
 $(eval $(call gb_Library_set_include,ipb,\
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
index ba1fad809e8e..264cec6db538 100644
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ipd))
 
+$(eval $(call gb_Library_use_external,ipd,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ipd))
 
 $(eval $(call gb_Library_set_include,ipd,\
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index 9ca7b2371418..ba4d5361a956 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ips))
 
+$(eval $(call gb_Library_use_external,ips,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ips))
 
 $(eval $(call gb_Library_set_include,ips,\
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index ffb3e695a2bb..283cf8a34aef 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ipt))
 
+$(eval $(call gb_Library_use_external,ipt,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ipt))
 
 $(eval $(call gb_Library_set_include,ipt,\
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
index 708e49f32fcc..9eeb5fd4eec5 100644
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ipx))
 
+$(eval $(call gb_Library_use_external,ipx,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ipx))
 
 $(eval $(call gb_Library_set_include,ipx,\
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
index 61f0b359ab20..4df5243e2922 100644
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,ira))
 
+$(eval $(call gb_Library_use_external,ira,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ira))
 
 $(eval $(call gb_Library_set_include,ira,\
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
index eb2690a224f1..282199691c74 100644
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,itg))
 
+$(eval $(call gb_Library_use_external,itg,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,itg))
 
 $(eval $(call gb_Library_set_include,itg,\
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
index 2fa9101af0f0..05cdac1fb01d 100644
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,iti))
 
+$(eval $(call gb_Library_use_external,iti,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,iti))
 
 $(eval $(call gb_Library_set_include,iti,\
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 410e9e8be46d..c4dfb2eaf84a 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_package,msfilter,filter_inc))
 
 $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
 
+$(eval $(call gb_Library_use_external,msfilter,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,msfilter))
 
 $(eval $(call gb_Library_set_include,msfilter,\
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index d20e33d3c845..e1fb40af6ec1 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,pdffilter))
 
 $(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter))
 
+$(eval $(call gb_Library_use_external,pdffilter,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,pdffilter))
 
 $(eval $(call gb_Library_set_include,pdffilter,\
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 4d54c1007ea9..b635c8850f51 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -54,7 +54,10 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_externals,svgfilter,libxml2))
+$(eval $(call gb_Library_use_externals,svgfilter,\
+	boost_headers \
+	libxml2 \
+))
 
 $(eval $(call gb_Library_add_exception_objects,svgfilter,\
 	filter/source/svg/b2dellipse \
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index 141e10529e38..d8dec8d15f03 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,xmlfa))
 
 $(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa))
 
+$(eval $(call gb_Library_use_external,xmlfa,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,xmlfa))
 
 $(eval $(call gb_Library_set_include,xmlfa,\
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
index 8e9a5d7e067d..0c59e013e13b 100644
--- a/filter/Library_xsltdlg.mk
+++ b/filter/Library_xsltdlg.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,xsltdlg))
 
 $(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
 
+$(eval $(call gb_Library_use_external,xsltdlg,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,xsltdlg))
 
 $(eval $(call gb_Library_set_include,xsltdlg,\