Hi, On 3 May 2013 22:14, Riccardo Magliocchetti <riccardo.magliocche...@gmail.com> wrote: > /home/rm/src/libo/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file > does not exist in solver, and cannot be delivered: > /home/rm/src/libo/solver/unxlngx6.pro/xml/component/desktop/source/splash/spl.component. > Stop. > > git suggests that spl related stuff was last touched in > 90750f0cbc775505e284d085998d326b2abc1471 . But my untrained eyes don't see > anything wrong there. Do you have any hint?
Yes, sorry, component files are needed mostly for postprocess/Rdb_services.mk 04353c273142fba62ea9b5fe62d66ee8e13814a2 fixes that. > While digging i find another occurence of spl. Then i found an occurrence of > Library_spl_unx which AFAIU given this scp2/source/ooo/file_library_ooo.scp > hunk: > > #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS > STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) > #endif > > does not make sense to build right? So does the patch below looks correct? Yes, it looks correct, except you need to also adapt postprocess/Rdb_services.mk and please also adapt Repository.mk > diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk > index 751fcf7..3b00eb0 100644 > --- a/desktop/Module_desktop.mk > +++ b/desktop/Module_desktop.mk > @@ -106,7 +106,7 @@ else > > $(eval $(call gb_Module_add_targets,desktop,\ > Executable_oosplash \ > - Library_spl_unx \ > + $(if $(ENABLE_HEADLESS),,Library_spl_unx) \ > )) > > endif > diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk > index 669b85a..bfb6a70 100644 > --- a/desktop/Pagein_common.mk > +++ b/desktop/Pagein_common.mk > @@ -61,7 +61,7 @@ $(eval $(call gb_Pagein_add_objects,common,\ > filterconfig \ > uui \ > svt \ > - spl \ > + $(if $(ENABLE_HEADLESS),,spl) \ > avmedia \ > helplinker \ > sax \ Thanks, Matus _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
