strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix headless build

Browse source 
Change-Id: I160186438a8ffbd942d38770c469454f1ed741b5
Reviewed-on: https://gerrit.libreoffice.org/34419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Thorsten Behrens 2017-02-18 23:49:38 +01:00
parent 12899c07be
commit a807f90b08
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Repository.mk
View file

@ -168,7 +168,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \ gengal \
$(if $(filter WNT,$(OS)),,uri-encode) \ $(if $(filter WNT,$(OS)),,uri-encode) \
$(if $(ENABLE_MACOSX_SANDBOX),, \ $(if $(ENABLE_MACOSX_SANDBOX),, \
ui-previewer \ $(if $(ENABLE_HEADLESS),, \
ui-previewer \
) \
) \ ) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
senddoc \ senddoc \
@ -315,7 +317,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
canvastools \ canvastools \
chartcore \ chartcore \
chartcontroller \ chartcontroller \
chartopengl \ $(if $(ENABLE_HEADLESS),, \
chartopengl \
) \
$(call gb_Helper_optional,OPENCL,clew) \ $(call gb_Helper_optional,OPENCL,clew) \
$(if $(filter $(OS),WNT),,cmdmail) \ $(if $(filter $(OS),WNT),,cmdmail) \
cppcanvas \ cppcanvas \
@ -930,7 +934,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
wizards_basicsrvtutorials \ wizards_basicsrvtutorials \
wizards_basicusr \ wizards_basicusr \
xmlsec \ xmlsec \
chart2_opengl_shader \ $(if $(ENABLE_HEADLESS),, \
chart2_opengl_shader \
) \
vcl_opengl_shader \ vcl_opengl_shader \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
vcl_opengl_blacklist \ vcl_opengl_blacklist \
@ -971,7 +977,11 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
$(eval $(call gb_Helper_register_packages_for_install,brand,\ $(eval $(call gb_Helper_register_packages_for_install,brand,\
desktop_branding \ desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \ $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \ $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
$(if $(ENABLE_HEADLESS),, \
desktop_soffice_sh \
) \
) \
readlicense_oo_files \ readlicense_oo_files \
$(if $(filter WNT,$(OS)),readlicense_oo_license) \ $(if $(filter WNT,$(OS)),readlicense_oo_license) \
$(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \ $(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \