| 1 |
grknight 14/09/01 01:15:27 |
| 2 |
|
| 3 |
Added: 5.2.7-r1-cxxlinkage.patch |
| 4 |
Log: |
| 5 |
Revision bump to enable multilib |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch?rev=1.1&view=markup |
| 13 |
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 |
| 14 |
|
| 15 |
Index: 5.2.7-r1-cxxlinkage.patch |
| 16 |
=================================================================== |
| 17 |
diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake |
| 18 |
--- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 |
| 19 |
+++ b/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400 |
| 20 |
@@ -105,16 +105,16 @@ |
| 21 |
# Finally remove the dot |
| 22 |
STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") |
| 23 |
|
| 24 |
- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) |
| 25 |
+ IF(MYSQL_CXX_LINKAGE) |
| 26 |
EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" |
| 27 |
OUTPUT_VARIABLE _mysql_config_output |
| 28 |
) |
| 29 |
SET(MYSQL_CXX_LINKAGE 1) |
| 30 |
- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) |
| 31 |
+ ELSE (MYSQL_CXX_LINKAGE) |
| 32 |
EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" |
| 33 |
OUTPUT_VARIABLE _mysql_config_output |
| 34 |
) |
| 35 |
- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) |
| 36 |
+ ENDIF(MYSQL_CXX_LINKAGE) |
| 37 |
|
| 38 |
# Remove the stl4port dependency |
| 39 |
STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") |
| 40 |
diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt |
| 41 |
--- a/CMakeLists.txt 2014-08-27 13:51:27.050553560 -0400 |
| 42 |
+++ b/CMakeLists.txt 2014-08-27 13:55:41.702359680 -0400 |
| 43 |
@@ -256,10 +256,9 @@ |
| 44 |
SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") |
| 45 |
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") |
| 46 |
|
| 47 |
-SET(LIB_SUBDIR "lib") |
| 48 |
-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") |
| 49 |
- SET(LIB_SUBDIR "lib64") |
| 50 |
-ENDIF() |
| 51 |
+IF(NOT LIB_SUBDIR) |
| 52 |
+ MESSAGE(ERROR "LIB_SUBDIR is not set") |
| 53 |
+ENDIF(NOT LIB_SUBDIR) |
| 54 |
MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") |
| 55 |
|
| 56 |
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) |
Archives