configure.ac | 5 ----- connectivity/Library_mysqlc.mk | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-)
New commits: commit a44fc53d055d414ca78e0020d125a73d4587f801 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Feb 7 15:34:38 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Feb 7 20:15:58 2026 +0100 Related: tdf#170410 remove redundant CRYPT_LIBS commit a726c634ac9cabedc1bbeb4ff655ff2f83fe8d8e Date: Mon Jan 12 23:02:34 2026 +0100 Fix "unable to find library -lcrypt" with recent glibc added a use of CRYPT_LIBS, but that doesn't appear in config_host.mk.in so effectively that universally removed -lcrypt from the mysqlc link line Change-Id: I58f49cddeec2b2d3445e569610e4848d310c84d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198886 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/configure.ac b/configure.ac index 879045e56cd9..ccfcb348c26e 100644 --- a/configure.ac +++ b/configure.ac @@ -10891,11 +10891,6 @@ 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 f6844ecf7550..01607b4f44d7 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 $(CRYPT_LIBS) -lm)) \ + -lz -lm,-rdynamic -lz -lm)) \ $(if $(filter LINUX,$(OS)),-ldl,) \ ))
