Group :: Sistema/Bibliotecas
RPM: mysql-connector-odbc
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: mysql-connector-odbc-8.0.22-alt-rpath.patch
Download
Download
Removing RPATH
diff --git a/mysql-connector-odbc/driver/CMakeLists.txt b/mysql-connector-odbc/driver/CMakeLists.txt
index decbbfe3..44bc80ad 100644
--- a/mysql-connector-odbc/driver/CMakeLists.txt
+++ b/mysql-connector-odbc/driver/CMakeLists.txt
@@ -160,8 +160,6 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
set_property(TARGET ${DRIVER_NAME} APPEND PROPERTY INSTALL_RPATH "@loader_path/private")
mangle_osx_rpaths(${DRIVER_NAME})
elseif(NOT WIN32)
- set_property(TARGET ${DRIVER_NAME} APPEND PROPERTY INSTALL_RPATH "$ORIGIN")
- set_property(TARGET ${DRIVER_NAME} APPEND PROPERTY INSTALL_RPATH "$ORIGIN/private")
endif()
# FIXME: RPATH not set anywhere...
diff --git a/mysql-connector-odbc/installer/CMakeLists.txt b/mysql-connector-odbc/installer/CMakeLists.txt
index 36e28d14..57535d18 100644
--- a/mysql-connector-odbc/installer/CMakeLists.txt
+++ b/mysql-connector-odbc/installer/CMakeLists.txt
@@ -77,8 +77,6 @@ if(APPLE)
set_property(TARGET myodbc-installer APPEND PROPERTY INSTALL_RPATH "@loader_path/../lib/private")
elseif(NOT WIN32)
set_property(TARGET myodbc-installer PROPERTY BUILD_WITH_INSTALL_RPATH ON)
- set_property(TARGET myodbc-installer APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../lib/")
- set_property(TARGET myodbc-installer APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../lib/private")
endif()
mangle_osx_rpaths(myodbc-installer)
diff --git a/mysql-connector-odbc/test/CMakeLists.txt b/mysql-connector-odbc/test/CMakeLists.txt
index e67def04..d14c9a05 100644
--- a/mysql-connector-odbc/test/CMakeLists.txt
+++ b/mysql-connector-odbc/test/CMakeLists.txt
@@ -101,7 +101,6 @@ if(APPLE)
set_property(TARGET ${T} APPEND PROPERTY INSTALL_RPATH "@loader_path")
elseif(NOT WIN32)
set_property(TARGET ${T} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
- set_property(TARGET ${T} APPEND PROPERTY INSTALL_RPATH "$ORIGIN")
endif()
ENDFOREACH(FN)