libcdr/ExternalProject_libcdr.mk | 12 +++++++----- solenv/gbuild/ExternalProject.mk | 11 +++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-)
New commits: commit 1a9740671cfe0f324135276fe42bd18f29dcda7d Author: Michael Stahl <[email protected]> Date: Fri Oct 5 17:48:45 2012 +0200 libcdr: hopefully get this to build unfortunately the ExternalProject uses a StaticLibrary built in libwpg. Change-Id: Ie4a8933247edbd2d53f697432a0848a05216237f diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index de48bae..719b752 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,11 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,cdrlib,\ - lcms2 \ - wpd \ - wpg \ - zlib \ -)) + libwpd \ +)) ifeq ($(OS)$(COM),WNTMSC) @@ -48,6 +45,8 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) +$(eval $(call gb_ExternalProject_use_package,libwpd)) + endif # SYSTEM_LIBWPD @@ -61,6 +60,9 @@ else # !SYSTEM_LIBWPG libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) +$(eval $(call gb_ExternalProject_use_package,libwpg_inc)) +$(eval $(call gb_ExternalProject_use_static_libraries,wpglib)) + endif # SYSTEM_LIBWPG diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 9ed1db7..41d86ad 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -124,6 +124,13 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Package_get_t endef +# TODO: do we really want to have projects depending on gbuild libraries? +define gb_ExternalProject_use_static_libraries +$(foreach $(lib),$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ + $(call gb_StaticLibrary_get_target,$(lib))) + +endef + # Make an external project depend on several packages at once # # gb_ExternalProject_use_packages external package(s) commit ff12d3033b9284a779ea32f7cbf20d840b1995f2 Author: Michael Stahl <[email protected]> Date: Fri Oct 5 17:35:47 2012 +0200 gbuild: implement gb_ExternalProject_use_externals Change-Id: Ie6eed251a5034d9761abca75506b677af394d945 diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 0680d75..9ed1db7 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -109,6 +109,10 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_ExternalProje endef +define gb_ExternalProject_use_externals +$(foreach external,$(2),$(call gb_ExternalProject_use_external,$(1),$(2))) +endef + # Make an external project depend on a package # # This is most useful for depending on output files created by another _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
