configure.ac | 5 +++++ connectivity/Library_mysqlc.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit a726c634ac9cabedc1bbeb4ff655ff2f83fe8d8e Author: Julien Nabet <[email protected]> AuthorDate: Mon Jan 12 23:02:34 2026 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Tue Jan 13 22:54:45 2026 +0100 Fix "unable to find library -lcrypt" with recent glibc ld.lld: error: unable to find library -lcrypt [LNK] Library/libunotest.so clang++: error: linker command failed with exit code 1 (use -v to see invocation) [MOD] svtools make[1]: *** [/home/julien/lo/libreoffice/connectivity/Library_mysqlc.mk:10: /home/julien/lo/libreoffice/instdir/program/libmysqlclo.so] Error 1 Change-Id: I6472de619971f631c76e2d463d2057fb26562db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197155 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Jenkins diff --git a/configure.ac b/configure.ac index dd5b61fd5b92..173a26b3bd55 100644 --- a/configure.ac +++ b/configure.ac @@ -10881,6 +10881,11 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then BUILD_TYPE="$BUILD_TYPE MARIADB_CONNECTOR_C" fi + save_LIBS=$LIBS + AC_SEARCH_LIBS([crypt], [crypt xcrypt], [CRYPT_LIBS="$LIBS"], [CRYPT_LIBS=""]) + LIBS=$save_LIBS + AC_SUBST([CRYPT_LIBS]) + AC_SUBST(SYSTEM_MARIADB_CONNECTOR_C) AC_SUBST(MARIADB_CFLAGS) AC_SUBST(MARIADB_LIBS) diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk index 99410d2c0ddb..f6844ecf7550 100644 --- a/connectivity/Library_mysqlc.mk +++ b/connectivity/Library_mysqlc.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\ $(eval $(call gb_Library_add_libs,mysqlc,\ $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \ $(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\ - -lz -lm,-rdynamic -lz -lcrypt -lm)) \ + -lz -lm,-rdynamic -lz $(CRYPT_LIBS) -lm)) \ $(if $(filter LINUX,$(OS)),-ldl,) \ ))
