/[packages]/cauldron/mariadb/current/SOURCES/mariadb-10.0.8-external_pcre.diff
ViewVC logotype

Contents of /cauldron/mariadb/current/SOURCES/mariadb-10.0.8-external_pcre.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 599466 - (show annotations) (download)
Tue Mar 4 11:42:12 2014 UTC (5 years, 8 months ago) by oden
File size: 8951 byte(s)
- P122: use system pcre (#12665)

1
2 http://bazaar.launchpad.net/~maria-captains/maria/10.0/revision/4025
3
4 diff -Naurp mariadb-10.0.8/client/CMakeLists.txt mariadb-10.0.8.oden/client/CMakeLists.txt
5 --- mariadb-10.0.8/client/CMakeLists.txt 2014-02-07 23:52:23.000000000 +0100
6 +++ mariadb-10.0.8.oden/client/CMakeLists.txt 2014-03-04 11:07:56.085228526 +0100
7 @@ -15,8 +15,7 @@
8
9 INCLUDE_DIRECTORIES(
10 ${CMAKE_SOURCE_DIR}/include
11 - ${CMAKE_BINARY_DIR}/pcre
12 - ${CMAKE_SOURCE_DIR}/pcre
13 + ${PCRE_INCLUDES}
14 ${CMAKE_SOURCE_DIR}/mysys_ssl
15 ${ZLIB_INCLUDE_DIR}
16 ${SSL_INCLUDE_DIRS}
17 diff -Naurp mariadb-10.0.8/cmake/jemalloc.cmake mariadb-10.0.8.oden/cmake/jemalloc.cmake
18 --- mariadb-10.0.8/cmake/jemalloc.cmake 2014-02-07 23:52:25.000000000 +0100
19 +++ mariadb-10.0.8.oden/cmake/jemalloc.cmake 2014-03-04 11:07:56.085228526 +0100
20 @@ -46,7 +46,7 @@ ELSE()
21 ENDIF()
22
23 SET(WITH_JEMALLOC ${WITH_JEMALLOC_DEFAULT} CACHE STRING
24 - "Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
25 + "Which jemalloc to use. Possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
26
27 MACRO (CHECK_JEMALLOC)
28 IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
29 diff -Naurp mariadb-10.0.8/cmake/pcre.cmake mariadb-10.0.8.oden/cmake/pcre.cmake
30 --- mariadb-10.0.8/cmake/pcre.cmake 1970-01-01 01:00:00.000000000 +0100
31 +++ mariadb-10.0.8.oden/cmake/pcre.cmake 2014-03-04 11:07:56.085228526 +0100
32 @@ -0,0 +1,16 @@
33 +SET(WITH_PCRE "auto" CACHE STRING
34 + "Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
35 +
36 +MACRO (CHECK_PCRE)
37 + IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
38 + CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE)
39 + ENDIF()
40 + IF(NOT HAVE_PCRE)
41 + IF (WITH_PCRE STREQUAL "system")
42 + MESSAGE(FATAL_ERROR "system pcre is not found or unusable")
43 + ENDIF()
44 + SET(PCRE_INCLUDES ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre)
45 + ADD_SUBDIRECTORY(pcre)
46 + ENDIF()
47 +ENDMACRO()
48 +
49 diff -Naurp mariadb-10.0.8/cmake/plugin.cmake mariadb-10.0.8.oden/cmake/plugin.cmake
50 --- mariadb-10.0.8/cmake/plugin.cmake 2014-02-07 23:52:29.000000000 +0100
51 +++ mariadb-10.0.8.oden/cmake/plugin.cmake 2014-03-04 11:07:56.085228526 +0100
52 @@ -37,8 +37,7 @@ MACRO(MYSQL_ADD_PLUGIN)
53 # Add common include directories
54 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
55 ${CMAKE_SOURCE_DIR}/sql
56 - ${CMAKE_BINARY_DIR}/pcre
57 - ${CMAKE_SOURCE_DIR}/pcre
58 + ${PCRE_INCLUDES}
59 ${SSL_INCLUDE_DIRS}
60 ${ZLIB_INCLUDE_DIR})
61
62 diff -Naurp mariadb-10.0.8/CMakeLists.txt mariadb-10.0.8.oden/CMakeLists.txt
63 --- mariadb-10.0.8/CMakeLists.txt 2014-02-07 23:52:25.000000000 +0100
64 +++ mariadb-10.0.8.oden/CMakeLists.txt 2014-03-04 11:07:56.084228525 +0100
65 @@ -153,6 +153,7 @@ INCLUDE(readline)
66 INCLUDE(libutils)
67 INCLUDE(dtrace)
68 INCLUDE(jemalloc)
69 +INCLUDE(pcre)
70 INCLUDE(ctest)
71 INCLUDE(plugin)
72 INCLUDE(install_macros)
73 @@ -355,6 +356,8 @@ MYSQL_CHECK_READLINE()
74 SET(MALLOC_LIBRARY "system")
75 CHECK_JEMALLOC()
76
77 +CHECK_PCRE()
78 +
79 #
80 # Setup maintainer mode options. Platform checks are
81 # not run with the warning options as to not perturb fragile checks
82 @@ -390,7 +393,6 @@ ADD_SUBDIRECTORY(include)
83 ADD_SUBDIRECTORY(dbug)
84 ADD_SUBDIRECTORY(strings)
85 ADD_SUBDIRECTORY(vio)
86 -ADD_SUBDIRECTORY(pcre)
87 ADD_SUBDIRECTORY(mysys)
88 ADD_SUBDIRECTORY(mysys_ssl)
89 ADD_SUBDIRECTORY(libmysql)
90 diff -Naurp mariadb-10.0.8/libmysql/CMakeLists.txt mariadb-10.0.8.oden/libmysql/CMakeLists.txt
91 --- mariadb-10.0.8/libmysql/CMakeLists.txt 2014-02-07 23:52:28.000000000 +0100
92 +++ mariadb-10.0.8.oden/libmysql/CMakeLists.txt 2014-03-04 11:07:56.085228526 +0100
93 @@ -16,8 +16,7 @@
94 INCLUDE_DIRECTORIES(
95 ${CMAKE_SOURCE_DIR}/include
96 ${CMAKE_SOURCE_DIR}/libmysql
97 - ${CMAKE_BINARY_DIR}/pcre
98 - ${CMAKE_SOURCE_DIR}/pcre
99 + ${PCRE_INCLUDES}
100 ${CMAKE_SOURCE_DIR}/strings
101 ${SSL_INCLUDE_DIRS}
102 ${SSL_INTERNAL_INCLUDE_DIRS}
103 diff -Naurp mariadb-10.0.8/libmysqld/CMakeLists.txt mariadb-10.0.8.oden/libmysqld/CMakeLists.txt
104 --- mariadb-10.0.8/libmysqld/CMakeLists.txt 2014-02-07 23:52:29.000000000 +0100
105 +++ mariadb-10.0.8.oden/libmysqld/CMakeLists.txt 2014-03-04 11:07:56.086228526 +0100
106 @@ -22,8 +22,7 @@ ${CMAKE_SOURCE_DIR}/libmysql
107 ${CMAKE_SOURCE_DIR}/libmysqld
108 ${CMAKE_SOURCE_DIR}/sql
109 ${CMAKE_BINARY_DIR}/sql
110 -${CMAKE_BINARY_DIR}/pcre
111 -${CMAKE_SOURCE_DIR}/pcre
112 +${PCRE_INCLUDES}
113 ${ZLIB_INCLUDE_DIR}
114 ${SSL_INCLUDE_DIRS}
115 ${SSL_INTERNAL_INCLUDE_DIRS}
116 diff -Naurp mariadb-10.0.8/libmysqld/examples/CMakeLists.txt mariadb-10.0.8.oden/libmysqld/examples/CMakeLists.txt
117 --- mariadb-10.0.8/libmysqld/examples/CMakeLists.txt 2014-02-07 23:52:23.000000000 +0100
118 +++ mariadb-10.0.8.oden/libmysqld/examples/CMakeLists.txt 2014-03-04 11:07:56.086228526 +0100
119 @@ -15,8 +15,7 @@
120
121 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
122 ${CMAKE_SOURCE_DIR}/libmysqld/include
123 - ${CMAKE_BINARY_DIR}/pcre
124 - ${CMAKE_SOURCE_DIR}/pcre
125 + ${PCRE_INCLUDES}
126 ${CMAKE_SOURCE_DIR}/sql
127 ${MY_READLINE_INCLUDE_DIR}
128 )
129 diff -Naurp mariadb-10.0.8/plugin/feedback/CMakeLists.txt mariadb-10.0.8.oden/plugin/feedback/CMakeLists.txt
130 --- mariadb-10.0.8/plugin/feedback/CMakeLists.txt 2014-02-07 23:52:30.000000000 +0100
131 +++ mariadb-10.0.8.oden/plugin/feedback/CMakeLists.txt 2014-03-04 11:07:56.086228526 +0100
132 @@ -1,6 +1,5 @@
133 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
134 - ${CMAKE_BINARY_DIR}/pcre
135 - ${CMAKE_SOURCE_DIR}/pcre
136 + ${PCRE_INCLUDES}
137 ${SSL_INCLUDE_DIRS})
138
139 SET(FEEDBACK_SOURCES feedback.cc sender_thread.cc
140 diff -Naurp mariadb-10.0.8/plugin/qc_info/CMakeLists.txt mariadb-10.0.8.oden/plugin/qc_info/CMakeLists.txt
141 --- mariadb-10.0.8/plugin/qc_info/CMakeLists.txt 2014-02-07 23:52:30.000000000 +0100
142 +++ mariadb-10.0.8.oden/plugin/qc_info/CMakeLists.txt 2014-03-04 11:07:56.086228526 +0100
143 @@ -1,6 +1,5 @@
144 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
145 - ${CMAKE_BINARY_DIR}/pcre
146 - ${CMAKE_SOURCE_DIR}/pcre
147 + ${PCRE_INCLUDES}
148 ${CMAKE_SOURCE_DIR}/extra/yassl/include)
149
150 MYSQL_ADD_PLUGIN(QUERY_CACHE_INFO qc_info.cc)
151 diff -Naurp mariadb-10.0.8/sql/CMakeLists.txt mariadb-10.0.8.oden/sql/CMakeLists.txt
152 --- mariadb-10.0.8/sql/CMakeLists.txt 2014-02-07 23:52:23.000000000 +0100
153 +++ mariadb-10.0.8.oden/sql/CMakeLists.txt 2014-03-04 11:07:56.086228526 +0100
154 @@ -16,8 +16,7 @@
155 INCLUDE_DIRECTORIES(
156 ${CMAKE_SOURCE_DIR}/include
157 ${CMAKE_SOURCE_DIR}/sql
158 -${CMAKE_BINARY_DIR}/pcre
159 -${CMAKE_SOURCE_DIR}/pcre
160 +${PCRE_INCLUDES}
161 ${ZLIB_INCLUDE_DIR}
162 ${SSL_INCLUDE_DIRS}
163 ${CMAKE_BINARY_DIR}/sql
164 diff -Naurp mariadb-10.0.8/storage/perfschema/CMakeLists.txt mariadb-10.0.8.oden/storage/perfschema/CMakeLists.txt
165 --- mariadb-10.0.8/storage/perfschema/CMakeLists.txt 2014-02-07 23:52:23.000000000 +0100
166 +++ mariadb-10.0.8.oden/storage/perfschema/CMakeLists.txt 2014-03-04 11:07:56.087228526 +0100
167 @@ -16,8 +16,7 @@
168 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
169 ${CMAKE_SOURCE_DIR}/include
170 ${CMAKE_SOURCE_DIR}/sql
171 - ${CMAKE_BINARY_DIR}/pcre
172 - ${CMAKE_SOURCE_DIR}/pcre
173 + ${PCRE_INCLUDES}
174 ${CMAKE_SOURCE_DIR}/extra/yassl/include)
175
176 ADD_DEFINITIONS(-DMYSQL_SERVER)
177 diff -Naurp mariadb-10.0.8/storage/perfschema/unittest/CMakeLists.txt mariadb-10.0.8.oden/storage/perfschema/unittest/CMakeLists.txt
178 --- mariadb-10.0.8/storage/perfschema/unittest/CMakeLists.txt 2014-02-07 23:52:23.000000000 +0100
179 +++ mariadb-10.0.8.oden/storage/perfschema/unittest/CMakeLists.txt 2014-03-04 11:07:56.087228526 +0100
180 @@ -15,8 +15,7 @@
181
182 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
183 ${CMAKE_SOURCE_DIR}/include/mysql
184 - ${CMAKE_BINARY_DIR}/pcre
185 - ${CMAKE_SOURCE_DIR}/pcre
186 + ${PCRE_INCLUDES}
187 ${CMAKE_SOURCE_DIR}/sql
188 ${SSL_INCLUDE_DIRS}
189 ${CMAKE_SOURCE_DIR}/unittest/mytap
190 diff -Naurp mariadb-10.0.8/unittest/mysys/CMakeLists.txt mariadb-10.0.8.oden/unittest/mysys/CMakeLists.txt
191 --- mariadb-10.0.8/unittest/mysys/CMakeLists.txt 2014-02-07 23:52:23.000000000 +0100
192 +++ mariadb-10.0.8.oden/unittest/mysys/CMakeLists.txt 2014-03-04 11:07:56.087228526 +0100
193 @@ -14,8 +14,7 @@
194 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
195
196 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
197 - ${CMAKE_BINARY_DIR}/pcre
198 - ${CMAKE_SOURCE_DIR}/pcre
199 + ${PCRE_INCLUDES}
200 ${CMAKE_SOURCE_DIR}/extra/yassl/include)
201
202 MY_ADD_TESTS(bitmap base64 my_vsnprintf my_atomic my_rdtsc lf my_malloc

  ViewVC Help
Powered by ViewVC 1.1.26