Repository.mk | 2 +- RepositoryExternal.mk | 2 +- solenv/gbuild/CppunitTest.mk | 2 +- vcl/Module_vcl.mk | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit f7e0182330ee3d4ea22c08c4d41c7fc87a53babd Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Mar 2 16:54:54 2026 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Mar 10 06:55:46 2026 +0100 macOS: Don't build vclplug_osx in headless mode at all The commit 9f9550a67dd2 ("make skia mandatory on macOS, disable aqua backend") removed all #if HAVE_FEATURE_SKIA guards from the macOS VCL plugin, assuming Skia is always available on macOS. This breaks the headless build (--enable-headless --disable-skia) because the osx plugin code unconditionally referenced SkiaHelper and AquaSkiaSalGraphicsImpl. The osx plugin is actually not needed in headless mode - the SVP plugin handles rendering there. Skip building it entirely, following the same pattern Windows already uses (USE_HEADLESS_CODE guard). Change-Id: Ieef842a3b6c045e7a82c1f3d28e9cb4f01b2a3c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200838 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/Repository.mk b/Repository.mk index 8c6d4b2b4089..0f57cb1f996d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -531,7 +531,7 @@ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \ sdui \ $(if $(ENABLE_GEN),vclplug_gen) \ $(if $(filter $(OS)-$(USE_HEADLESS_CODE),WNT-),vclplug_win) \ - $(if $(filter $(OS),MACOSX),vclplug_osx) \ + $(if $(filter $(OS)-$(USE_HEADLESS_CODE),MACOSX-),vclplug_osx) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4d0730fc0460..bfac25432fe3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4146,7 +4146,7 @@ define gb_Executable__register_gengal $(call gb_Executable_add_runtime_dependencies,gengal,\ $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ $(call gb_Library_get_target_for_build,localedata_en) \ - $(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \ + $(if $(filter MACOSX-,$(OS_FOR_BUILD)-$(USE_HEADLESS_CODE)),$(call gb_Library_get_target_for_build,vclplug_osx)) \ $(if $(filter WNT-,$(OS_FOR_BUILD)-$(USE_HEADLESS_CODE)),$(call gb_Library_get_target_for_build,vclplug_win)) \ $(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \ $(call gb_Package_get_target_for_build,postprocess_registry) \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bbd7852910db..cb6ee1d387d1 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -258,7 +258,7 @@ $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)),, \ $(if $(ENABLE_QT5),$(call gb_Library_get_target,vclplug_qt5)) \ $(if $(ENABLE_QT6),$(call gb_Library_get_target,vclplug_qt6)) \ ) -else ifeq ($(OS),MACOSX) +else ifeq ($(OS)-$(USE_HEADLESS_CODE),MACOSX-) $(call gb_CppunitTest_get_target,$(1)): $(call gb_Library_get_target,vclplug_osx) else ifeq ($(OS)-$(USE_HEADLESS_CODE),WNT-) $(call gb_CppunitTest_get_target,$(1)): $(call gb_Library_get_target,vclplug_win) diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 72c310f6930f..4915d661ba09 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -137,6 +137,11 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,vcl,\ Package_osxres \ +)) +endif + +ifeq ($(OS)-$(USE_HEADLESS_CODE),MACOSX-) +$(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_osx \ )) endif
