jurt/source/pipe/staticsalhack.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit c41004d5fa5b57ff7b971274f0f14c2c7ea70638
Author: Stephan Bergmann <stephan.bergm...@collabora.com>
AuthorDate: Tue Jul 8 10:20:34 2025 +0200
Commit: Stephan Bergmann <stephan.bergm...@collabora.com>
CommitDate: Tue Jul 8 13:12:41 2025 +0200
Don't leave sal_detail_log undefined in Library_jpipe__staticsalhack
...as that lead to failure of loading that library now after
7a4e60b63d0006cf06d18f3d4c7519d72cddc97b "add -Wl,-z,relro,-z,now to
hardening
ldflags". (But actually including sal/osl/all/log.cxx would then drag
along a
dependency on BACKTRACE_LIBS, so instead just add stubs here, as those
functions
should never get called anyway.)
Change-Id: Idd0442a607dda247763692c183f872d0ca14487e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187534
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@collabora.com>
diff --git a/jurt/source/pipe/staticsalhack.cxx
b/jurt/source/pipe/staticsalhack.cxx
index fd03738f8d8d..9e021b399ecf 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -90,6 +90,13 @@ extern "C" ImplTextEncodingData const*
sal_getFullTextEncodingData(rtl_TextEncod
std::abort();
}
+void sal_detail_log(sal_detail_LogLevel, char const*, char const*, char
const*, sal_uInt32)
+{
+ std::abort();
+}
+
+unsigned char sal_detail_log_report(sal_detail_LogLevel, char const*) {
std::abort(); }
+
#pragma clang diagnostic ignored "-Weverything"
extern "C" {
#include <src/dtoa.c> // workdir/UnpackedTarball/dtoa/src/dtoa.c
