solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 5d283f4224d73c89242099d1d4ccbfd6df9c2a82
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Mar 19 12:15:36 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Tue Mar 19 17:43:31 2024 +0100
Exclude Library_postgresql-sdbc-impl from --enable-mergelibs=more again
...which had been added there with ae17922b7d0f797129dd5fbd5514d691ac9ebeaa
"add
more libs into --enable-mergelibs=more build". But: For one, I'm not quite
sure why the postgresql-sdbc functionality is split into two libraries
Library_postgresql-sdbc and Library_postgresql-sdbc-impl, but there's
supposedly
a reason why the latter should stay in a dynamic library of its own? And
for
another, at least my --enable-ldap --enable-mergelibs=more
--without-system-openldap etc. Linux build now started to crash during exit
of
CppunitTest_sd_export_tests-ooxml2 with
> Invalid free() / delete / delete[] / realloc()
> at 0x4845B2C: free (vg_replace_malloc.c:985)
> by 0x1C5C11E3: ber_memfree_x (memory.c:152)
> by 0x62895DC6: ldap_int_destroy_global_options (init.c:543)
> by 0x40010F1: _dl_call_fini (dl-call_fini.c:43)
> by 0x400506D: _dl_fini (dl-fini.c:114)
> by 0x4EE7FD5: __run_exit_handlers (exit.c:111)
> by 0x4EE811D: exit (exit.c:141)
> by 0x4ECF150: (below main) (libc_start_call_main.h:74)
> Address 0x103070f1f7f00 is not stack'd, malloc'd or (recently) free'd
apparently because there are two competing at-exit calls to
ldap_int_destroy_global_options in both LO's
workdir/UnpackedTarball/openldap/libraries/libldap/init.c in
instdir/program/libmergedlo.so (where that code ends up now, instead of in a
library of its own that would apparently not happen to be loaded for this
test)
and in
/usr/src/debug/openldap-2.6.6-1.fc39.x86_64/openldap-2.6.6/libraries/libldap/init.c
in my (Fedora 39) system's /usr/lib64/libldap.so.2 (which apparently
happens to
get loaded into the process due to whatever other dependency).
Change-Id: I5f4b944dfe2e09df2c6d33fc31d4dded4a453c60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165025
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 2c2e59479465..68b9e5245e68 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -168,9 +168,7 @@ gb_MERGE_LIBRARY_LIST += \
OGLTrans \
odbc \
pdffilter \
- $(if $(BUILD_POSTGRESQL_SDBC), \
- postgresql-sdbc \
- postgresql-sdbc-impl) \
+ $(if $(BUILD_POSTGRESQL_SDBC),postgresql-sdbc) \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
rpt \
