MDEV-19603 MariaDB 10.4 does not build on OpenBSD due to the use of libdl

a773d932 · Sergei Golubchik · 153cd6a2 · a773d932 · ae4e58ba
Commit a773d932 authored Jul 31, 2020 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

plugin/auth_pam/CMakeLists.txt plugin/auth_pam/CMakeLists.txt +1 -1

wsrep-lib wsrep-lib +1 -1

No files found.
--- a/plugin/auth_pam/CMakeLists.txt
+++ b/plugin/auth_pam/CMakeLists.txt
@@ -25,7 +25,7 @@ IF(HAVE_PAM_APPL_H)
  FIND_LIBRARY(PAM_LIBRARY pam) # for srpm build-depends detection
  ADD_DEFINITIONS(-D_GNU_SOURCE)
  MYSQL_ADD_PLUGIN(auth_pam_v1 auth_pam_v1.c LINK_LIBRARIES pam MODULE_ONLY)
-  MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam dl MODULE_ONLY)
+  MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam ${LIBDL} MODULE_ONLY)
  IF (TARGET auth_pam)
    MYSQL_ADD_EXECUTABLE(auth_pam_tool auth_pam_tool.c DESTINATION ${INSTALL_PLUGINDIR}/auth_pam_tool_dir COMPONENT Server)
    TARGET_LINK_LIBRARIES(auth_pam_tool pam)

--- a/wsrep-lib @ ae4e58ba
+++ b/wsrep-lib @ ae4e58ba
-Subproject commit 3e5a28df32c85c7768dd84d1731ad4661bf90022
+Subproject commit ae4e58ba031587039c8830f2f8ca51fa9fb7d6eb