Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@×××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Thu, 27 Mar 2014 17:45:29
Message-Id: 1395942168.54d6cda99c49d9ccde3e566d0e0f5513c4d1a25b.grknight.pub@gentoo
1 commit: 54d6cda99c49d9ccde3e566d0e0f5513c4d1a25b
2 Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
3 AuthorDate: Thu Mar 27 17:42:48 2014 +0000
4 Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
5 CommitDate: Thu Mar 27 17:42:48 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=54d6cda9
7
8 Respin patch for mysql-5.5.37
9
10 Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
11
12 ---
13 00000_index.txt | 8 +-
14 20006_all_cmake_elib-mysql-5.5.37.patch | 172 ++++++++++++++++++++++++++++++++
15 2 files changed, 179 insertions(+), 1 deletion(-)
16
17 diff --git a/00000_index.txt b/00000_index.txt
18 index e56fbae..e1c4075 100644
19 --- a/00000_index.txt
20 +++ b/00000_index.txt
21 @@ -1571,7 +1571,13 @@
22 @@ Also install static libs by ENABLE_STATIC_LIBS
23
24 @patch 20006_all_cmake_elib-mysql-5.5.35.patch
25 -@ver 5.05.35.00 to 5.05.99.99
26 +@ver 5.05.35.00 to 5.05.36.99
27 +@pn mysql
28 +@@ Add ELIBPATH to split client and embedded libs
29 +@@ Also install static libs by ENABLE_STATIC_LIBS
30 +
31 +@patch 20006_all_cmake_elib-mysql-5.5.37.patch
32 +@ver 5.05.37.00 to 5.05.99.99
33 @pn mysql
34 @@ Add ELIBPATH to split client and embedded libs
35 @@ Also install static libs by ENABLE_STATIC_LIBS
36
37 diff --git a/20006_all_cmake_elib-mysql-5.5.37.patch b/20006_all_cmake_elib-mysql-5.5.37.patch
38 new file mode 100644
39 index 0000000..a56805c
40 --- /dev/null
41 +++ b/20006_all_cmake_elib-mysql-5.5.37.patch
42 @@ -0,0 +1,172 @@
43 +diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
44 +--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638 -0100
45 ++++ mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100
46 +@@ -43,7 +43,8 @@
47 + # - INSTALL_SBINDIR (directory with mysqld)
48 + # - INSTALL_SCRIPTDIR (several scripts, rarely used)
49 + #
50 +-# - INSTALL_LIBDIR (directory with client end embedded libraries)
51 ++# - INSTALL_LIBDIR (directory with client libraries)
52 ++# - INSTALL_ELIBDIR (directory with embedded libraries)
53 + # - INSTALL_PLUGINDIR (directory for plugins)
54 + #
55 + # - INSTALL_INCLUDEDIR (directory for MySQL headers)
56 +@@ -117,6 +118,7 @@
57 + SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
58 + #
59 + SET(INSTALL_LIBDIR_STANDALONE "lib")
60 ++SET(INSTALL_ELIBDIR_STANDALONE "lib")
61 + SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
62 + #
63 + SET(INSTALL_INCLUDEDIR_STANDALONE "include")
64 +@@ -148,9 +150,11 @@
65 + #
66 + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
67 + SET(INSTALL_LIBDIR_RPM "lib64")
68 ++ SET(INSTALL_ELIBDIR_RPM "lib64")
69 + SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
70 + ELSE()
71 + SET(INSTALL_LIBDIR_RPM "lib")
72 ++ SET(INSTALL_ELIBDIR_RPM "lib")
73 + SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
74 + ENDIF()
75 + #
76 +@@ -178,6 +182,7 @@
77 + SET(INSTALL_SCRIPTDIR_DEB "scripts")
78 + #
79 + SET(INSTALL_LIBDIR_DEB "lib")
80 ++SET(INSTALL_ELIBDIR_DEB "lib")
81 + SET(INSTALL_PLUGINDIR_DEB "lib/plugin")
82 + #
83 + SET(INSTALL_INCLUDEDIR_DEB "include")
84 +@@ -204,6 +209,7 @@
85 + SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
86 + #
87 + SET(INSTALL_LIBDIR_SVR4 "lib")
88 ++SET(INSTALL_ELIBDIR_SVR4 "lib")
89 + SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
90 + #
91 + SET(INSTALL_INCLUDEDIR_SVR4 "include")
92 +@@ -234,7 +240,7 @@
93 + # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
94 + # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
95 + # layout is chosen)
96 +-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
97 ++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
98 + INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
99 + SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
100 + CACHE STRING "${var} installation directory" ${FORCE})
101 +diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
102 +--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100
103 ++++ mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100
104 +@@ -40,6 +40,8 @@
105 + # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 .... linklibN]
106 + # [EXPORTS exported_func1 .... exported_func_N]
107 + # [OUTPUT_NAME output_name]
108 ++# [OUTPUT_DIR output_dir]
109 ++
110 + # This macro merges several static libraries into a single one or creates a shared
111 + # library from several convenience libraries
112 +
113 +@@ -214,7 +216,7 @@
114 + #)
115 + MACRO(MERGE_LIBRARIES)
116 + MYSQL_PARSE_ARGUMENTS(ARG
117 +- "EXPORTS;OUTPUT_NAME;COMPONENT"
118 ++ "EXPORTS;OUTPUT_NAME;COMPONENT;OUTPUT_DIR"
119 + "STATIC;SHARED;MODULE;NOINSTALL"
120 + ${ARGN}
121 + )
122 +@@ -265,7 +267,11 @@
123 + IF(ARG_COMPONENT)
124 + SET(COMP COMPONENT ${ARG_COMPONENT})
125 + ENDIF()
126 +- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
127 ++ IF(ARG_OUTPUT_DIR)
128 ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP})
129 ++ ELSE()
130 ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
131 ++ ENDIF()
132 + ENDIF()
133 + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "")
134 +
135 +diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt
136 +--- mysql-old/libmysql/CMakeLists.txt 2014-01-20 00:14:06.580799638 -0100
137 ++++ mysql/libmysql/CMakeLists.txt 2014-01-20 00:15:27.647802721 -0100
138 +@@ -163,9 +163,14 @@
139 +
140 + SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
141 +
142 ++SET(INSTALL_STATIC_LIBS "")
143 ++IF(NOT ENABLE_STATIC_LIBS)
144 ++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
145 ++ENDIF()
146 ++
147 + # Merge several convenience libraries into one big mysqlclient
148 + # and link them together into shared library.
149 +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
150 ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS})
151 +
152 + # Visual Studio users need debug static library for debug projects
153 + INSTALL_DEBUG_SYMBOLS(clientlib)
154 +@@ -196,9 +196,11 @@
155 +
156 + IF(UNIX)
157 + GET_TARGET_NAME(mysqlclient lib_name)
158 +- INSTALL_SYMLINK(mysqlclient
159 +- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
160 +- ${INSTALL_LIBDIR} Development)
161 ++ IF(ENABLE_STATIC_LIBS)
162 ++ INSTALL_SYMLINK(mysqlclient
163 ++ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
164 ++ ${INSTALL_LIBDIR} Development)
165 ++ ENDIF()
166 + ENDIF()
167 +
168 + IF(NOT DISABLE_SHARED)
169 +diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
170 +--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
171 ++++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
172 +@@ -126,8 +126,13 @@
173 + ENDIF()
174 + ENDFOREACH()
175 +
176 ++SET(INSTALL_STATIC_LIBS "")
177 ++IF(NOT ENABLE_STATIC_LIBS)
178 ++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
179 ++ENDIF()
180 ++
181 + MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
182 +- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
183 ++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
184 +
185 + # Visual Studio users need debug static library
186 + IF(MSVC)
187 +@@ -135,12 +135,14 @@
188 + ENDIF()
189 +
190 + IF(UNIX)
191 +- INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME
192 ++ INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME
193 + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
194 + ENDIF()
195 +
196 + IF(NOT DISABLE_SHARED)
197 +- MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS})
198 ++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}
199 ++ COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR})
200 ++
201 + IF(UNIX)
202 + # Name the shared library, handle versioning (provides same api as client library
203 + # hence the same version)
204 +--- mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500
205 ++++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500
206 +@@ -26,4 +26,6 @@
207 + my_thread_scheduler_service.c)
208 +
209 + ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
210 +-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
211 ++IF(ENABLE_STATIC_LIBS)
212 ++ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
213 ++ENDIF()
214 +