diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 19:37:19 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-03 04:56:36 +0100 |
| commit | 6ac1e9e7f0be23b529992c268d2c563fe40fff76 (patch) | |
| tree | 2df92b2e2faa696f98189f9dd5a079dcf99b63b3 /desktop | |
| parent | 8b9f8f0f9d38cc64f742fe5358fce88d0f82391a (diff) | |
Disable the xmlCleanupParser test in a static build
Linking the static soffice.bin results in a failure, because
of the duplicate xmlCleanupParser symbol. I don't think there
is a sensible, alternative runtime test for a static LO build.
You could analyse the static binary itself...
Change-Id: Ib871e378a28affca24c4285d396d8bcae478f1f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126198
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 4 | ||||
| -rw-r--r-- | desktop/source/app/main.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index 9c08a28361df..14a72ab6c055 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -14,6 +14,10 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\ -I$(SRCDIR)/desktop/source/inc \ )) +$(eval $(call gb_Executable_add_defs,soffice_bin,\ + $(if $(DISABLE_DYNLOADING),$(if $(SYSTEM_LIBXML),,-DNOTEST_xmlCleanupParser)) \ +)) + $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c index 6631c3ceb337..fdd2eb3505dc 100644 --- a/desktop/source/app/main.c +++ b/desktop/source/app/main.c @@ -21,6 +21,7 @@ #include "sofficemain.h" +#ifndef NOTEST_xmlCleanupParser #ifdef DBG_UTIL #ifdef __gnu_linux__ #include <stdio.h> @@ -43,15 +44,18 @@ __attribute__((visibility("default"))) void xmlCleanupParser(void) } #endif #endif +#endif // NOTEST_xmlCleanupParser SAL_IMPLEMENT_MAIN() { int ret = soffice_main(); +#ifndef NOTEST_xmlCleanupParser #ifdef DBG_UTIL #ifdef __gnu_linux__ g_Exiting = 1; #endif #endif +#endif return ret; } |