RepositoryExternal.mk | 4 ++--
solenv/gbuild/Gallery.mk | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 63a43711ac1e85b15f6912f568d0a5fb021da920
Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com>
Date: Thu Jun 6 18:52:57 2013 +0200
Don't require vclplug_svp with --enable-headless
Fixes build.
Change-Id: I4280cc26acd2278003f3bdee641a3168b01e17cb
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58c0fcd..2a1b2b3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2889,9 +2889,9 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \
+ $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),,
\
$(call gb_Library_get_target,vclplug_svp) \
- ) \
+ )) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0273b50..5ce7a6b 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,9 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
$(call gb_Helper_print_on_error,\
- $(if $(filter-out MACOSX
WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
+ $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if
$(ENABLE_HEADLESS),, \
+ SAL_USE_VCLPLUGIN=svp \
+ )) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
