Blame SOURCES/mysql-connector-odbc-drop-odbc-linking-from-driver.patch

878c59
This patch drops the linking of odbc library to the driver as it's not needed.
878c59
Just linking against odbcinst is enough.
878c59
878c59
The reason is the same as the one explained here:
878c59
https://www.postgresql.org/message-id/1769926.65KUyECjFr@nb.usersys.redhat.com
878c59
878c59
This fixes a problem in isql under s390x architecture.
878c59
878c59
More information also here:
878c59
https://bugzilla.redhat.com/show_bug.cgi?id=1561400
878c59
878c59
diff -Naur mysql-connector-odbc-5.2.5-src-orig/cmake/FindODBC.cmake mysql-connector-odbc-5.2.5-src/cmake/FindODBC.cmake
878c59
--- mysql-connector-odbc-5.2.5-src-orig/cmake/FindODBC.cmake	2018-04-10 16:14:29.219980686 +0200
878c59
+++ mysql-connector-odbc-5.2.5-src/cmake/FindODBC.cmake	2018-04-11 15:59:13.064365508 +0200
878c59
@@ -106,6 +106,8 @@
878c59
 
878c59
       IF(NOT ODBC_LIB_DIR)
878c59
         _FIX_NOPREFIX(ODBC_LINK_FLAGS ${ODBC_CONFIG} "--libs")
878c59
+        _FIX_NOPREFIX(ODBC_LIB_PREFIX ${ODBC_CONFIG} "--lib-prefix")
878c59
+        SET(ODBCINST_LINK_FLAGS "-L${ODBC_LIB_PREFIX} -lodbcinst")
878c59
       ENDIF(NOT ODBC_LIB_DIR)
878c59
 
878c59
     ENDIF(NOT ODBC_CONFIG)
878c59
diff -Naur mysql-connector-odbc-5.2.5-src-orig/driver/CMakeLists.txt mysql-connector-odbc-5.2.5-src/driver/CMakeLists.txt
878c59
--- mysql-connector-odbc-5.2.5-src-orig/driver/CMakeLists.txt	2018-04-10 16:14:29.212980622 +0200
878c59
+++ mysql-connector-odbc-5.2.5-src/driver/CMakeLists.txt	2018-04-11 16:01:41.813735855 +0200
878c59
@@ -57,7 +57,7 @@
878c59
 	TARGET_LINK_LIBRARIES(${DRIVER_NAME} myodbc3u
878c59
 				${MYSQL_CLIENT_LIBS} ${ODBCINSTLIB} ${SECURE32_LIB})
878c59
 ELSE(WIN32)
878c59
-	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ODBC_LINK_FLAGS}")
878c59
+	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ODBCINST_LINK_FLAGS}")
878c59
 	TARGET_LINK_LIBRARIES(${DRIVER_NAME} ${MYSQL_CLIENT_LIBS} ${CMAKE_THREAD_LIBS_INIT} m)
878c59
 	TARGET_LINK_LIBRARIES(${DRIVER_NAME} myodbc3u)
878c59