Skip to content

Commit 8cff1ba

Browse files
committed
WL#14113: Fix bundling of the SASL authentication plugin dependencies.
1. The libk5crypto.so was excluded by mistake, 2. We also need to bundle all SASL modules present in lib/private/sasl2/ folder.
1 parent 84f329f commit 8cff1ba

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ if(BUNDLE_DEPENDENCIES)
399399
get_filename_component(lib_name ${lib} NAME_WE)
400400

401401
# ssl|crypto are bundled on cdk/cmake/DepFindSSL.cmake
402-
if(NOT lib_name MATCHES "mysql|protobuf|lber|ldap_r|ssl|crypto")
402+
if(NOT lib_name MATCHES "mysql|libprotobuf|liblber|libldap_r|libssl|libcrypto")
403403

404404
message("found bundled libs: ${lib}")
405405

@@ -410,6 +410,17 @@ if(BUNDLE_DEPENDENCIES)
410410

411411
endif()
412412

413+
# Also bundle modules required by the SASL library if it is bundled
414+
415+
if(lib_name MATCHES "libsasl")
416+
417+
install(DIRECTORY "${MYSQL_LIB_DIR}/private/sasl2"
418+
DESTINATION "${INSTALL_LIB_DIR}/private"
419+
COMPONENT JDBCDll
420+
)
421+
422+
endif()
423+
413424
endforeach()
414425

415426
file(GLOB _bundled "${MYSQL_PLUGIN_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")

0 commit comments

Comments
 (0)