grknight 14/09/01 01:15:27 Added: 5.2.7-r1-cxxlinkage.patch Log: Revision bump to enable multilib (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Revision Changes Path 1.1 dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch?rev=1.1&content-type=text/plain Index: 5.2.7-r1-cxxlinkage.patch =================================================================== diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake --- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 +++ b/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400 @@ -105,16 +105,16 @@ # Finally remove the dot STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") - IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) + IF(MYSQL_CXX_LINKAGE) EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" OUTPUT_VARIABLE _mysql_config_output ) SET(MYSQL_CXX_LINKAGE 1) - ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) + ELSE (MYSQL_CXX_LINKAGE) EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" OUTPUT_VARIABLE _mysql_config_output ) - ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) + ENDIF(MYSQL_CXX_LINKAGE) # Remove the stl4port dependency STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt --- a/CMakeLists.txt 2014-08-27 13:51:27.050553560 -0400 +++ b/CMakeLists.txt 2014-08-27 13:55:41.702359680 -0400 @@ -256,10 +256,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}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
