[Libreoffice-commits] .: liborcus/ExternalProject_liborcus.mk RepositoryExternal.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 10 05:56:57 PST 2012
RepositoryExternal.mk | 6 ++++++
liborcus/ExternalProject_liborcus.mk | 2 ++
2 files changed, 8 insertions(+)
New commits:
commit cdb6eca477c2c5553fa06d9e5e28b6e67aa58865
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Nov 10 08:56:12 2012 -0500
liborcus needs boost
Change-Id: I83c6bd1bfb44e74b9f659a970b5c32d7475addfb
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6ffed9a..eb5e22e 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 637c449..54ef44a 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 \
))
More information about the Libreoffice-commits
mailing list