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

27 files changed, 54 insertions, 0 deletions

diff --git a/bridges/Library_cc50_solaris_intel.mk b/bridges/Library_cc50_solaris_intel.mk
index 8472c9d70ee9..7e3565de112c 100644
--- a/bridges/Library_cc50_solaris_intel.mk
+++ b/bridges/Library_cc50_solaris_intel.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc50_solaris_intel
 
 $(eval $(call gb_Library_Library,sunpro5_uno))
 
+$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_cc50_solaris_sparc.mk b/bridges/Library_cc50_solaris_sparc.mk
index b3efb0ebb0a5..2e6ca9cfffaa 100644
--- a/bridges/Library_cc50_solaris_sparc.mk
+++ b/bridges/Library_cc50_solaris_sparc.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc50_solaris_sparc
 
 $(eval $(call gb_Library_Library,sunpro5_uno))
 
+$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_cc5_solaris_sparc64.mk b/bridges/Library_cc5_solaris_sparc64.mk
index e29e0170c107..2c12767ad93f 100644
--- a/bridges/Library_cc5_solaris_sparc64.mk
+++ b/bridges/Library_cc5_solaris_sparc64.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc5_solaris_sparc64
 
 $(eval $(call gb_Library_Library,sunpro5_uno))
 
+$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_aix_powerpc.mk b/bridges/Library_gcc3_aix_powerpc.mk
index 0b541926e2b1..e27df57f4ecf 100644
--- a/bridges/Library_gcc3_aix_powerpc.mk
+++ b/bridges/Library_gcc3_aix_powerpc.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_ios_arm.mk b/bridges/Library_gcc3_ios_arm.mk
index 4f5d7ffa42e0..314a5891c784 100644
--- a/bridges/Library_gcc3_ios_arm.mk
+++ b/bridges/Library_gcc3_ios_arm.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_ios_arm
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
 	bridges/source/cpp_uno/gcc3_ios_arm \
 ))
diff --git a/bridges/Library_gcc3_linux_alpha.mk b/bridges/Library_gcc3_linux_alpha.mk
index 77d331d390c3..35e196482dc1 100644
--- a/bridges/Library_gcc3_linux_alpha.mk
+++ b/bridges/Library_gcc3_linux_alpha.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_alpha
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk
index 94711eaecbab..95c85d2c6e65 100644
--- a/bridges/Library_gcc3_linux_arm.mk
+++ b/bridges/Library_gcc3_linux_arm.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_hppa.mk b/bridges/Library_gcc3_linux_hppa.mk
index fea698d9f4ad..bb2e90d456bc 100644
--- a/bridges/Library_gcc3_linux_hppa.mk
+++ b/bridges/Library_gcc3_linux_hppa.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_hppa
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_ia64.mk b/bridges/Library_gcc3_linux_ia64.mk
index 6f71829dc9f3..8944948411cf 100644
--- a/bridges/Library_gcc3_linux_ia64.mk
+++ b/bridges/Library_gcc3_linux_ia64.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_ia64
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk
index 502093241a98..02a033b5515a 100644
--- a/bridges/Library_gcc3_linux_intel.mk
+++ b/bridges/Library_gcc3_linux_intel.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_intel
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_m68k.mk b/bridges/Library_gcc3_linux_m68k.mk
index 5175d374246b..015764e81288 100644
--- a/bridges/Library_gcc3_linux_m68k.mk
+++ b/bridges/Library_gcc3_linux_m68k.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_m68k
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk
index a5dfe34b0f7c..37ca9b0b14cd 100644
--- a/bridges/Library_gcc3_linux_mips.mk
+++ b/bridges/Library_gcc3_linux_mips.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_mips
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_powerpc.mk b/bridges/Library_gcc3_linux_powerpc.mk
index cbf62694e062..c9c79c4aa3e6 100644
--- a/bridges/Library_gcc3_linux_powerpc.mk
+++ b/bridges/Library_gcc3_linux_powerpc.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_powerpc64.mk b/bridges/Library_gcc3_linux_powerpc64.mk
index acb1f3f1a3c9..baf6bf30d98f 100644
--- a/bridges/Library_gcc3_linux_powerpc64.mk
+++ b/bridges/Library_gcc3_linux_powerpc64.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_s390.mk b/bridges/Library_gcc3_linux_s390.mk
index 2624e9e176d5..388ef817c69d 100644
--- a/bridges/Library_gcc3_linux_s390.mk
+++ b/bridges/Library_gcc3_linux_s390.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_s390
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_s390x.mk b/bridges/Library_gcc3_linux_s390x.mk
index d2400e98b157..4216d3c23601 100644
--- a/bridges/Library_gcc3_linux_s390x.mk
+++ b/bridges/Library_gcc3_linux_s390x.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_s390x
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_sparc.mk b/bridges/Library_gcc3_linux_sparc.mk
index 5b2a9dc5bc19..0240316c7135 100644
--- a/bridges/Library_gcc3_linux_sparc.mk
+++ b/bridges/Library_gcc3_linux_sparc.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_sparc
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_linux_x86-64.mk b/bridges/Library_gcc3_linux_x86-64.mk
index b1e596778730..93b5d2ad1913 100644
--- a/bridges/Library_gcc3_linux_x86-64.mk
+++ b/bridges/Library_gcc3_linux_x86-64.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_macosx_intel.mk b/bridges/Library_gcc3_macosx_intel.mk
index 2dc7dc02ce10..48078538491c 100644
--- a/bridges/Library_gcc3_macosx_intel.mk
+++ b/bridges/Library_gcc3_macosx_intel.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_intel
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_macosx_powerpc.mk b/bridges/Library_gcc3_macosx_powerpc.mk
index 450ebe7d476b..67b8b696ce7d 100644
--- a/bridges/Library_gcc3_macosx_powerpc.mk
+++ b/bridges/Library_gcc3_macosx_powerpc.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_macosx_x86-64.mk b/bridges/Library_gcc3_macosx_x86-64.mk
index 309d672092e7..2a05faa48119 100644
--- a/bridges/Library_gcc3_macosx_x86-64.mk
+++ b/bridges/Library_gcc3_macosx_x86-64.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_solaris_intel.mk b/bridges/Library_gcc3_solaris_intel.mk
index f3175faea884..8cdababd472f 100644
--- a/bridges/Library_gcc3_solaris_intel.mk
+++ b/bridges/Library_gcc3_solaris_intel.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_intel
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_gcc3_solaris_sparc.mk b/bridges/Library_gcc3_solaris_sparc.mk
index 5dab7c0345d0..456717ae420f 100644
--- a/bridges/Library_gcc3_solaris_sparc.mk
+++ b/bridges/Library_gcc3_solaris_sparc.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk
index 178a008192eb..758b6da5d0b3 100644
--- a/bridges/Library_java_uno.mk
+++ b/bridges/Library_java_uno.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Library_Library,java_uno))
 
+$(eval $(call gb_Library_use_external,java_uno,boost_headers))
+
 ifeq ($(OS)$(COM),WNTGCC)
 ifeq ($(EXCEPTIONS),sjlj)
 $(eval $(call gb_Library_add_defs,java_uno,\
diff --git a/bridges/Library_mingw_intel.mk b/bridges/Library_mingw_intel.mk
index 98b95897706a..2a57d28e7ff6 100644
--- a/bridges/Library_mingw_intel.mk
+++ b/bridges/Library_mingw_intel.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := mingw_intel
 
 $(eval $(call gb_Library_Library,gcc3_uno))
 
+$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_msvc_win32_intel.mk b/bridges/Library_msvc_win32_intel.mk
index b8c098d69ff5..aa51b9cd2ec6 100644
--- a/bridges/Library_msvc_win32_intel.mk
+++ b/bridges/Library_msvc_win32_intel.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := msvc_win32_intel
 
 $(eval $(call gb_Library_Library,msci_uno))
 
+$(eval $(call gb_Library_use_external,msci_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,msci_uno,\
 	udkapi \
 ))
diff --git a/bridges/Library_msvc_win32_x86-64.mk b/bridges/Library_msvc_win32_x86-64.mk
index 86c9d3c308c8..cf34370080bf 100644
--- a/bridges/Library_msvc_win32_x86-64.mk
+++ b/bridges/Library_msvc_win32_x86-64.mk
@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := msvc_win32_x86-64
 
 $(eval $(call gb_Library_Library,mscx_uno))
 
+$(eval $(call gb_Library_use_external,mscx_uno,boost_headers))
+
 $(eval $(call gb_Library_use_internal_comprehensive_api,mscx_uno,\
 	udkapi \
 ))