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>
This commit is contained in:
Jan-Marek Glogowski 2021-12-01 19:37:19 +01:00
parent 8b9f8f0f9d
commit 6ac1e9e7f0
2 changed files with 8 additions and 0 deletions

View file

@ -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 \

View file

@ -21,6 +21,7 @@
#include "sofficemain.h"
#ifndef NOTEST_xmlCleanupParser
#ifdef DBG_UTIL
#ifdef __gnu_linux__
#include <stdio.h>
@ -43,14 +44,17 @@ __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;
}