1 |
grknight 14/05/05 02:29:34 |
2 |
|
3 |
Added: mysql-connector-c++-1.1.3-fix-cmake.patch |
4 |
Log: |
5 |
Version bump. |
6 |
Fix bugs #442662 and #445122. |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: mysql-connector-c++-1.1.3-fix-cmake.patch |
17 |
=================================================================== |
18 |
--- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400 |
19 |
+++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400 |
20 |
@@ -38,7 +38,7 @@ |
21 |
|
22 |
if(COMMAND cmake_policy AND POLICY CMP0015) |
23 |
cmake_policy(SET CMP0015 NEW) |
24 |
-endif(COMMAND cmake_policy) |
25 |
+endif(COMMAND cmake_policy AND POLICY CMP0015) |
26 |
|
27 |
#----------------- |
28 |
# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment |
29 |
@@ -258,14 +258,14 @@ |
30 |
${CPACK_RESOURCE_FILE_LICENSE} |
31 |
"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt" |
32 |
"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" |
33 |
- DESTINATION "." OPTIONAL) |
34 |
+ DESTINATION "${INSTALL_DOCS}" OPTIONAL) |
35 |
|
36 |
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/" |
37 |
".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile" |
38 |
"install_manifest.txt") |
39 |
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" ) |
40 |
|
41 |
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$") |
42 |
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$") |
43 |
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" ) |
44 |
SET(CPACK_SOURCE_GENERATOR "TGZ") |
45 |
|
46 |
@@ -292,10 +292,6 @@ |
47 |
ADD_SUBDIRECTORY(cppconn) |
48 |
ADD_SUBDIRECTORY(driver) |
49 |
ADD_SUBDIRECTORY(examples) |
50 |
-ADD_SUBDIRECTORY(test) |
51 |
-ADD_SUBDIRECTORY(test/framework) |
52 |
-ADD_SUBDIRECTORY(test/CJUnitTestsPort) |
53 |
-ADD_SUBDIRECTORY(test/unit) |
54 |
|
55 |
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") |
56 |
# see also README |
57 |
--- a/FindMySQL.cm 2014-05-04 22:20:50.000000000 -0400 |
58 |
+++ b/FindMySQL.cm 2014-05-04 22:21:40.325384447 -0400 |
59 |
@@ -58,7 +58,7 @@ |
60 |
EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" |
61 |
OUTPUT_VARIABLE _mysql_config_output |
62 |
) |
63 |
- STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}") |
64 |
+ STRING(REGEX MATCHALL " -m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}") |
65 |
STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}") |
66 |
# ADD_DEFINITIONS("${MYSQL_CXXFLAGS}") |
67 |
ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32) |
68 |
diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt |
69 |
--- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 |
70 |
+++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200 |
71 |
@@ -55,7 +55,7 @@ |
72 |
|
73 |
SET(MYSQLCPPCONN_INSTALL_HEADERS |
74 |
build_config.h |
75 |
- config.h |
76 |
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h |
77 |
connection.h |
78 |
datatype.h |
79 |
driver.h |
80 |
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt |
81 |
--- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 |
82 |
+++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200 |
83 |
@@ -26,6 +26,9 @@ |
84 |
|
85 |
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) |
86 |
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) |
87 |
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}) |
88 |
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn) |
89 |
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi) |
90 |
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}) |
91 |
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}") |
92 |
|
93 |
@@ -149,20 +152,22 @@ |
94 |
nativeapi/native_statement_wrapper.h |
95 |
nativeapi/mysql_native_resultset_wrapper.h |
96 |
nativeapi/native_resultset_wrapper.h |
97 |
- ../cppconn/warning.h |
98 |
- ../cppconn/statement.h |
99 |
- ../cppconn/sqlstring.h |
100 |
- ../cppconn/resultset_metadata.h |
101 |
- ../cppconn/resultset.h |
102 |
- ../cppconn/prepared_statement.h |
103 |
- ../cppconn/parameter_metadata.h |
104 |
- ../cppconn/metadata.h |
105 |
- ../cppconn/exception.h |
106 |
- ../cppconn/driver.h |
107 |
- ../cppconn/datatype.h |
108 |
- ../cppconn/connection.h |
109 |
- ../cppconn/config.h |
110 |
- ../cppconn/build_config.h |
111 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h |
112 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h |
113 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h |
114 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h |
115 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h |
116 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h |
117 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h |
118 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h |
119 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h |
120 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h |
121 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h |
122 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h |
123 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h |
124 |
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h |
125 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h |
126 |
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h |
127 |
|
128 |
) |
129 |
|
130 |
@@ -271,8 +276,8 @@ |
131 |
) |
132 |
ELSE(WIN32) |
133 |
INSTALL(TARGETS mysqlcppconn mysqlcppconn-static |
134 |
- LIBRARY DESTINATION lib |
135 |
- ARCHIVE DESTINATION lib |
136 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
137 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} |
138 |
) |
139 |
ENDIF(WIN32) |