summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-11-10 08:56:12 -0500
committerPeter Foley <pefoley2@verizon.net>2012-11-10 08:57:06 -0500
commitcdb6eca477c2c5553fa06d9e5e28b6e67aa58865 (patch)
tree56dde432303348da54e0c6212e679e0ae87b78b9
parent70dcf3426d7519429e0afae3809dc9dbcd01ce45 (diff)
liborcus needs boost
Change-Id: I83c6bd1bfb44e74b9f659a970b5c32d7475addfb
-rw-r--r--RepositoryExternal.mk6
-rw-r--r--liborcus/ExternalProject_liborcus.mk2
2 files changed, 8 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6ffed9a4a092..eb5e22efd2e9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -416,6 +416,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
+gb_ExternalProject__use_boost_headers:=
+
else # !SYSTEM_BOOST
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
@@ -450,6 +452,10 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
+define gb_ExternalProject__use_boost_headers
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost)
+
+endef
endif # SYSTEM_BOOST
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 637c4493fb60..54ef44a858fd 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,liborcus))
$(eval $(call gb_ExternalProject_use_unpacked,liborcus,orcus))
+$(eval $(call gb_ExternalProject_use_external,liborcus,boost_headers))
+
$(eval $(call gb_ExternalProject_register_targets,liborcus,\
build \
))