Write RPATH to mysql_config_editor only if OpenSSL is bundled

Change-Id: I7e698ef555cb3640526583dd01a83f40abcd4c40
(cherry picked from commit 5e7ac5fcca76266c879d16916f3efa7034807287)

Author: Paweł Andruszkiewicz

cmake/exeutils.cmake

@@ -126,10 +126,15 @@ endfunction()
 
 function(install_bundled_binaries)
   set(options)
-  set(oneValueArgs DESTINATION TARGET)
+  set(oneValueArgs DESTINATION TARGET WRITE_RPATH)
   set(multiValueArgs BINARIES)
   cmake_parse_arguments(INSTALL_BUNDLED "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
+  if(NOT DEFINED INSTALL_BUNDLED_WRITE_RPATH)
+    # if not explicitly specified, we always add an RPATH
+    set(INSTALL_BUNDLED_WRITE_RPATH TRUE)
+  endif()
+
   if(WIN32 AND (INSTALL_BUNDLED_DESTINATION STREQUAL INSTALL_LIBDIR OR INSTALL_BUNDLED_DESTINATION MATCHES "^${INSTALL_LIBDIR}/.*"))
     # on Windows, if files should be installed in the 'lib' directory, we install them in the 'bin' directory instead
     set(INSTALL_BUNDLED_DESTINATION "${INSTALL_BINDIR}")
@@ -141,8 +146,9 @@ function(install_bundled_binaries)
     if(NOT IS_SYMLINK "${SOURCE_BINARY}")
       message(STATUS "Bundling binary: ${SOURCE_BINARY}, installation directory: ${INSTALL_BUNDLED_DESTINATION}")
       if(LINUX)
-        # we always add an RPATH, if we bundle a binary, then for sure it is going to use one of the other libraries
-        write_rpath(BINARY "${SOURCE_BINARY}" DESTINATION "${INSTALL_BUNDLED_DESTINATION}" TARGET ${INSTALL_BUNDLED_TARGET})
+        if(INSTALL_BUNDLED_WRITE_RPATH)
+          write_rpath(BINARY "${SOURCE_BINARY}" DESTINATION "${INSTALL_BUNDLED_DESTINATION}" TARGET ${INSTALL_BUNDLED_TARGET})
+        endif()
       elseif(APPLE)
         # if we bundle OpenSSL, then we want the bundled binary to use it instead of the system one
         if(BUNDLED_OPENSSL)

mysql-secret-store/login-path/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -45,6 +45,13 @@ set(helper_libs
 add_helper_executable()
 
 # If defined, installs the mysql_config_editor binary into the shell bundle
-IF (BUNDLED_MYSQL_CONFIG_EDITOR)
-  install_bundled_binaries(BINARIES "${BUNDLED_MYSQL_CONFIG_EDITOR}" DESTINATION "${INSTALL_LIBEXECDIR}" TARGET mysql-secret-store-login-path)
+IF(BUNDLED_MYSQL_CONFIG_EDITOR)
+  # there are some issues in case of RPM builds if an ELF is patched with patchelf < 0.16.0 and then binary is stripped;
+  # we don't bundle OpenSSL there, so we make patching conditional
+  IF(BUNDLED_OPENSSL)
+    SET(WRITE_RPATH TRUE)
+  ELSE()
+    SET(WRITE_RPATH FALSE)
+  ENDIF()
+  install_bundled_binaries(BINARIES "${BUNDLED_MYSQL_CONFIG_EDITOR}" DESTINATION "${INSTALL_LIBEXECDIR}" TARGET mysql-secret-store-login-path WRITE_RPATH ${WRITE_RPATH})
 ENDIF()