solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 045e551875cbd68ead6371b56ff13b3842648c1a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Feb 27 11:23:49 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 27 14:39:05 2024 +0100
remove hsqldb from mergedlibs
regression from
commit ae17922b7d0f797129dd5fbd5514d691ac9ebeaa
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Feb 14 09:33:05 2024 +0200
add more libs into --enable-mergelibs=more build
sberg is seeing
This breaks e.g. dbaccess_hsqldb_test with
java.lang.UnsatisfiedLinkError: java.lang.UnsatisfiedLinkError:
likely because the jar file is trying to load libhsqldb.so instead of
libmerged.so
Change-Id: I9f42aea6471dbe35b27a584465b333a1d30caf5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164022
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 45aee4d1a4a9..be34e8d03121 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -144,7 +144,6 @@ gb_MERGE_LIBRARY_LIST += \
) \
graphicfilter \
hwp \
- $(if $(ENABLE_JAVA),hsqldb) \
log \
$(if $(ENABLE_LWP),lwpft) \
$(if $(filter $(OS),MACOSX), \
