diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:40:13 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-25 11:05:47 +0000 |
| commit | 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch) | |
| tree | 1482b9e0b899a783f64aaed3b9728533a81eff58 /desktop | |
| parent | 44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff) | |
fix headless build
disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test
Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 7 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index d24f6156d20c..30dc9073ba6d 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -140,6 +140,13 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/lokclipboard \ )) endif +ifeq ($(ENABLE_HEADLESS),TRUE) +$(eval $(call gb_Library_add_exception_objects,sofficeapp,\ + desktop/source/lib/init \ + desktop/source/lib/lokinteractionhandler \ + desktop/source/lib/lokclipboard \ +)) +endif endif ifeq ($(ENABLE_TELEPATHY),TRUE) diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 21f1e0c93169..f850cff97dd6 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -95,7 +95,10 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() /* Run test for OpenGL support in own process to avoid crash with broken * OpenGL drivers. Start process as early as possible. */ - bool bSuccess = fire_glxtest_process(); + bool bSuccess = false; +#if HAVE_FEATURE_OPENGL + bSuccess = fire_glxtest_process(); +#endif SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with glxtest"); #endif |