From a53586f4efe26b8875107d04001f4ecec760c343 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Sat, 26 Jan 2013 21:19:13 +0100
Subject: 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
---
 stoc/Library_bootstrap.mk     | 2 ++
 stoc/Library_introspection.mk | 2 ++
 stoc/Library_invocadapt.mk    | 2 ++
 stoc/Library_invocation.mk    | 2 ++
 stoc/Library_javavm.mk        | 2 ++
 stoc/Library_namingservice.mk | 2 ++
 stoc/Library_reflection.mk    | 2 ++
 7 files changed, 14 insertions(+)

(limited to 'stoc')

diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index e68ddfaaca6b..b7f2a5e77a3f 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -42,6 +42,8 @@ $(eval $(call gb_Library_set_include,bootstrap,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,bootstrap,boost_headers))
+
 $(eval $(call gb_Library_use_internal_bootstrap_api,bootstrap,\
     udkapi \
 ))
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index be2eaf6711e2..fe4bc3dd5464 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,introspection))
 
+$(eval $(call gb_Library_use_external,introspection,boost_headers))
+
 $(eval $(call gb_Library_use_udk_api,introspection))
 
 $(eval $(call gb_Library_use_libraries,introspection,\
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index 81165cd9fc40..e053e53eb91c 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,invocadapt))
 
+$(eval $(call gb_Library_use_external,invocadapt,boost_headers))
+
 $(eval $(call gb_Library_use_udk_api,invocadapt))
 
 $(eval $(call gb_Library_use_libraries,invocadapt,\
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index e5970024345d..46ca5c37b4db 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,invocation))
 
+$(eval $(call gb_Library_use_external,invocation,boost_headers))
+
 $(eval $(call gb_Library_use_udk_api,invocation))
 
 $(eval $(call gb_Library_use_libraries,invocation,\
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index 78d018cf9cc3..592ca6ae10c5 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,javavm))
 
+$(eval $(call gb_Library_use_external,javavm,boost_headers))
+
 $(eval $(call gb_Library_use_udk_api,javavm))
 
 $(eval $(call gb_Library_use_libraries,javavm,\
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index 0b049f5aefa3..8dda20d9c1a8 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,namingservice))
 
+$(eval $(call gb_Library_use_external,namingservice,boost_headers))
+
 $(eval $(call gb_Library_use_udk_api,namingservice))
 
 $(eval $(call gb_Library_use_libraries,namingservice,\
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 71fd2cdbc81f..f2d6f57f0c21 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,reflection))
 
+$(eval $(call gb_Library_use_external,reflection,boost_headers))
+
 $(eval $(call gb_Library_use_udk_api,reflection))
 
 $(eval $(call gb_Library_use_libraries,reflection,\
-- 
cgit