Skip to content

Commit eeaab5c

Browse files
Tor Didriksendahlerlend
Tor Didriksen
authored andcommitted
Bug#37616148 Build on Oracle Linux 10 [plugin RPATH]
Followup patch: When configuring with both -DWITH_AWS_SDK=.... and -DWITH_SSL=.... we must strip away both paths to the SDK libraries and <build dir>/library_output_directory Change-Id: Iffa0ed172541ab0742ed9199040d4ced16aa6831
1 parent 7602d1c commit eeaab5c

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

cmake/rpath_remove_plugin.cmake.in

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,20 @@ EXECUTE_PROCESS(COMMAND ${PATCHELF_EXECUTABLE} --print-rpath ${DEBUG_PLUGIN}
7070
IF(${DEBUG_PLUGIN} MATCHES "keyring_aws")
7171
# There are only static libraries in the AWS SDK anyways,
7272
# Strip away the library path.
73+
STRING(REGEX MATCH
74+
":${AWS_SDK_ROOT_DIR}/lib64:(.*)/library_output_directory:"
75+
UNUSED ${PATCHELF_PATH})
76+
# -DWITH_AWS_SDK=.... -DWITH_SSL=....
77+
IF(CMAKE_MATCH_1)
78+
FILE(RPATH_CHANGE
79+
FILE "${DEBUG_PLUGIN}"
80+
OLD_RPATH
81+
"${AWS_SDK_ROOT_DIR}/lib64:${CMAKE_MATCH_1}/library_output_directory:"
82+
NEW_RPATH ""
83+
)
84+
RETURN()
85+
ENDIF()
86+
# -DWITH_AWS_SDK=.... and system openssl
7387
IF(${PATCHELF_PATH} MATCHES "${AWS_SDK_ROOT_DIR}/lib64:")
7488
FILE(RPATH_CHANGE
7589
FILE "${DEBUG_PLUGIN}"

0 commit comments

Comments
 (0)