diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-27 11:23:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-27 14:39:05 +0100 |
| commit | 045e551875cbd68ead6371b56ff13b3842648c1a (patch) | |
| tree | 612824505eccc156944b942fc98b74f5e3dccf50 /solenv/gbuild/extensions | |
| parent | c9d3e68481e4db0e732b9186b75b582a5b41271b (diff) | |
remove hsqldb from mergedlibs
regression from
commit ae17922b7d0f797129dd5fbd5514d691ac9ebeaa
Author: Noel Grandin <noel.grandin@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.grandin@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
1 files changed, 0 insertions, 1 deletions
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), \ |