Hello,
Il 23/05/2013 22:10, Matúš Kukan ha scritto:
On 23 May 2013 17:21, Riccardo Magliocchetti
<riccardo.magliocche...@gmail.com> wrote:
i need this to unbreak --enable-headless compilation (still compiling) with
latest master but it puzzles me the other vclplug entries doesn't need the
same check, any hint on what --enable-headless is doing wrong since this
does not break other GUIBASEs?
diff --git a/Repository.mk b/Repository.mk
index c6a779d..97bcece 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_tde \
vclplug_kde \
vclplug_kde4 \
- vclplug_svp \
+ $(if $(filter unx,$(GUIBASE)),vclplug_svp) \
Why do you need this ? What does it fix ?
I don't see any obvious reason for this... nor how it could be related
to --enable-headless
Finally find some more time to investigate the issue and produced the
attached patch. I think that the correct check for svplug stuff should
be GUIBASE == unx as done in vcl/Module_vcl.mk.
The error is:
/home/rm/src/libo/solenv/gbuild/Package.mk:35: *** gb_Deliver_deliver:
file does not exist in solver, and cannot be delivered:
/home/rm/src/libo/solver/unxlngx6.pro/lib/libvclplug_svplo.so
If the patch looks good i'll push it after libo finishes to compile.
thanks,
riccardo
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4fcdf4b..8c401f6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2971,7 +2971,7 @@ $(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 unx,$(GUIBASE)), \
$(call gb_Library_get_target,vclplug_svp) \
) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index bf7d72c..de29fa8 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,7 @@ $(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 unx,$(GUIBASE)),SAL_USE_VCLPLUGIN=svp) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
