diff options
Diffstat (limited to 'dev-db/myodbc/files/5.3-cxxlinkage.patch')
| -rw-r--r-- | dev-db/myodbc/files/5.3-cxxlinkage.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch b/dev-db/myodbc/files/5.3-cxxlinkage.patch new file mode 100644 index 0000000..319262c --- /dev/null +++ b/dev-db/myodbc/files/5.3-cxxlinkage.patch @@ -0,0 +1,43 @@ +diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +--- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 ++++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 +@@ -747,7 +747,7 @@ + endif() + + if(NOT MYSQL_CXXFLAGS) +- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) ++ if(MYSQL_CXX_LINKAGE) + _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") + set(MYSQL_CXX_LINKAGE 1) + else() +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500 ++++ b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500 +@@ -242,10 +242,9 @@ + SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") + SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") + +-SET(LIB_SUBDIR "lib") +-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") +- SET(LIB_SUBDIR "lib64") +-ENDIF() ++IF(NOT LIB_SUBDIR) ++ MESSAGE(ERROR "LIB_SUBDIR is not set") ++ENDIF(NOT LIB_SUBDIR) + + MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") + +diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +--- a/cmake/FindMySQL.cmake 2017-02-17 14:44:29.532733308 -0500 ++++ b/cmake/FindMySQL.cmake 2017-02-17 14:48:56.756740330 -0500 +@@ -270,8 +270,8 @@ + set(_static_lib_ext ".lib") # Careful, can be import library for DLL + elseif(MYSQLCLIENT_NO_THREADS) + # In 5.1 and below there is a single threaded library +- set(_dynamic_libs "mysqlclient") +- set(_static_libs "libmysqlclient.a") ++ set(_dynamic_libs "${MYSQLCLIENT_LIB_NAME}") ++ set(_static_libs "lib${MYSQLCLIENT_LIB_NAME}.a") + set(_static_lib_ext ".a") + else() + # We try the multithreaded "libmysqlclient_r" first and if not |