1 |
commit: c6601b758d82903807230a8a643d702be94d139c |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 18:05:53 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 18:05:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=c6601b75 |
7 |
|
8 |
Respin elib patch for MySQL 5.7 |
9 |
|
10 |
20006_all_cmake_elib-mysql-5.7.patch | 191 +++++++++++++++++++++++++++++++++++ |
11 |
1 file changed, 191 insertions(+) |
12 |
|
13 |
diff --git a/20006_all_cmake_elib-mysql-5.7.patch b/20006_all_cmake_elib-mysql-5.7.patch |
14 |
new file mode 100644 |
15 |
index 0000000..7672f79 |
16 |
--- /dev/null |
17 |
+++ b/20006_all_cmake_elib-mysql-5.7.patch |
18 |
@@ -0,0 +1,191 @@ |
19 |
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake |
20 |
+--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638 -0100 |
21 |
++++ mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100 |
22 |
+@@ -43,7 +43,8 @@ |
23 |
+ # - INSTALL_SBINDIR (directory with mysqld) |
24 |
+ # - INSTALL_SCRIPTDIR (several scripts, rarely used) |
25 |
+ # |
26 |
+-# - INSTALL_LIBDIR (directory with client end embedded libraries) |
27 |
++# - INSTALL_LIBDIR (directory with client libraries) |
28 |
++# - INSTALL_ELIBDIR (directory with embedded libraries) |
29 |
+ # - INSTALL_PLUGINDIR (directory for plugins) |
30 |
+ # |
31 |
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers) |
32 |
+@@ -117,6 +118,7 @@ |
33 |
+ SET(INSTALL_SCRIPTDIR_STANDALONE "scripts") |
34 |
+ # |
35 |
+ SET(INSTALL_LIBDIR_STANDALONE "lib") |
36 |
++SET(INSTALL_ELIBDIR_STANDALONE "lib") |
37 |
+ SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") |
38 |
+ # |
39 |
+ SET(INSTALL_INCLUDEDIR_STANDALONE "include") |
40 |
+@@ -148,9 +150,11 @@ |
41 |
+ # |
42 |
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") |
43 |
+ SET(INSTALL_LIBDIR_RPM "lib64") |
44 |
++ SET(INSTALL_ELIBDIR_RPM "lib64") |
45 |
+ SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") |
46 |
+ ELSE() |
47 |
+ SET(INSTALL_LIBDIR_RPM "lib") |
48 |
++ SET(INSTALL_ELIBDIR_RPM "lib") |
49 |
+ SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin") |
50 |
+ ENDIF() |
51 |
+ # |
52 |
+@@ -178,6 +182,7 @@ |
53 |
+ SET(INSTALL_SCRIPTDIR_DEB "scripts") |
54 |
+ # |
55 |
+ SET(INSTALL_LIBDIR_DEB "lib") |
56 |
++SET(INSTALL_ELIBDIR_DEB "lib") |
57 |
+ SET(INSTALL_PLUGINDIR_DEB "lib/plugin") |
58 |
+ # |
59 |
+ SET(INSTALL_INCLUDEDIR_DEB "include") |
60 |
+@@ -204,6 +209,7 @@ |
61 |
+ SET(INSTALL_SCRIPTDIR_SVR4 "scripts") |
62 |
+ # |
63 |
+ SET(INSTALL_LIBDIR_SVR4 "lib") |
64 |
++SET(INSTALL_ELIBDIR_SVR4 "lib") |
65 |
+ SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin") |
66 |
+ # |
67 |
+ SET(INSTALL_INCLUDEDIR_SVR4 "include") |
68 |
+@@ -456,8 +456,8 @@ |
69 |
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR |
70 |
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE |
71 |
+ # layout is chosen) |
72 |
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN |
73 |
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN |
74 |
+ INFO MYSQLTEST DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST |
75 |
+ SECURE_FILE_PRIV SECURE_FILE_PRIV_EMBEDDED MYSQLKEYRING) |
76 |
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}} |
77 |
+ CACHE STRING "${var} installation directory" ${FORCE}) |
78 |
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake |
79 |
+--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100 |
80 |
++++ mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100 |
81 |
+@@ -40,6 +40,8 @@ |
82 |
+ # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 .... linklibN] |
83 |
+ # [EXPORTS exported_func1 .... exported_func_N] |
84 |
+ # [OUTPUT_NAME output_name] |
85 |
++# [OUTPUT_DIR output_dir] |
86 |
++ |
87 |
+ # This macro merges several static libraries into a single one or creates a shared |
88 |
+ # library from several convenience libraries |
89 |
+ |
90 |
+@@ -214,7 +216,7 @@ |
91 |
+ #) |
92 |
+ MACRO(MERGE_LIBRARIES) |
93 |
+ MYSQL_PARSE_ARGUMENTS(ARG |
94 |
+- "EXPORTS;OUTPUT_NAME;COMPONENT" |
95 |
++ "EXPORTS;OUTPUT_NAME;COMPONENT;OUTPUT_DIR" |
96 |
+ "STATIC;SHARED;MODULE;NOINSTALL" |
97 |
+ ${ARGN} |
98 |
+ ) |
99 |
+@@ -265,7 +267,11 @@ |
100 |
+ IF(ARG_COMPONENT) |
101 |
+ SET(COMP COMPONENT ${ARG_COMPONENT}) |
102 |
+ ENDIF() |
103 |
+- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
104 |
++ IF(ARG_OUTPUT_DIR) |
105 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP}) |
106 |
++ ELSE() |
107 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
108 |
++ ENDIF() |
109 |
+ ENDIF() |
110 |
+ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") |
111 |
+ |
112 |
+diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt |
113 |
+--- mysql-old/libmysql/CMakeLists.txt 2014-01-20 00:14:06.580799638 -0100 |
114 |
++++ mysql/libmysql/CMakeLists.txt 2014-01-20 00:15:27.647802721 -0100 |
115 |
+@@ -179,8 +179,13 @@ |
116 |
+ LIST(APPEND LIBS auth_win_client) |
117 |
+ ENDIF() |
118 |
+ |
119 |
++SET(INSTALL_STATIC_LIBS "") |
120 |
++IF(NOT ENABLE_STATIC_LIBS) |
121 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
122 |
++ENDIF() |
123 |
++ |
124 |
+ # Merge several convenience libraries into one big mysqlclient |
125 |
+-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) |
126 |
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) |
127 |
+ |
128 |
+ # Visual Studio users need debug static library for debug projects |
129 |
+ INSTALL_DEBUG_SYMBOLS(clientlib) |
130 |
+diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt |
131 |
+--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100 |
132 |
++++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100 |
133 |
+@@ -126,8 +126,13 @@ |
134 |
+ ENDIF() |
135 |
+ ENDFOREACH() |
136 |
+ |
137 |
++SET(INSTALL_STATIC_LIBS "") |
138 |
++IF(NOT ENABLE_STATIC_LIBS) |
139 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
140 |
++ENDIF() |
141 |
++ |
142 |
+ MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} |
143 |
+- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded) |
144 |
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) |
145 |
+ |
146 |
+ # Visual Studio users need debug static library |
147 |
+ IF(MSVC) |
148 |
+@@ -135,12 +135,14 @@ |
149 |
+ ENDIF() |
150 |
+ |
151 |
+ IF(UNIX) |
152 |
+- INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME |
153 |
++ INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME |
154 |
+ ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) |
155 |
+ ENDIF() |
156 |
+ |
157 |
+ IF(NOT DISABLE_SHARED) |
158 |
+- MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}) |
159 |
++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS} |
160 |
++ COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR}) |
161 |
++ |
162 |
+ IF(UNIX) |
163 |
+ # Name the shared library, handle versioning (provides same api as client library |
164 |
+ # hence the same version) |
165 |
+--- mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500 |
166 |
++++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500 |
167 |
+@@ -26,4 +26,6 @@ |
168 |
+ my_thread_scheduler_service.c) |
169 |
+ |
170 |
+ ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) |
171 |
+-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) |
172 |
++IF(ENABLE_STATIC_LIBS) |
173 |
++ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) |
174 |
++ENDIF() |
175 |
+ |
176 |
+diff -aurN mysql.old/scripts/CMakeLists.txt mysql/scripts/CMakeLists.txt |
177 |
+--- mysql.old/scripts/CMakeLists.txt 2014-03-14 15:07:28.000000000 -0400 |
178 |
++++ mysql/scripts/CMakeLists.txt 2014-04-25 22:46:35.000000000 -0400 |
179 |
+@@ -239,6 +239,7 @@ |
180 |
+ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) |
181 |
+ SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) |
182 |
+ SET(localstatedir ${MYSQL_DATADIR}) |
183 |
++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) |
184 |
+ |
185 |
+ SET(RPATH_OPTION "") |
186 |
+ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") |
187 |
+diff -aurN mysql.old/scripts/mysql_config.sh mysql/scripts/mysql_config.sh |
188 |
+--- mysql.old/scripts/mysql_config.sh 2014-03-14 15:07:28.000000000 -0400 |
189 |
++++ mysql/scripts/mysql_config.sh 2014-04-25 22:48:26.000000000 -0400 |
190 |
+@@ -91,6 +91,10 @@ |
191 |
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` |
192 |
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin |
193 |
+ |
194 |
++elibdir='@elibdir@' |
195 |
++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` |
196 |
++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib |
197 |
++ |
198 |
+ pkgincludedir='@pkgincludedir@' |
199 |
+ if [ -f "$basedir/include/mysql/mysql.h" ]; then |
200 |
+ pkgincludedir="$basedir/include/mysql" |
201 |
+@@ -116,7 +116,7 @@ |
202 |
+ # Create options |
203 |
+ libs="-L$pkglibdir@RPATH_OPTION@" |
204 |
+ libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@" |
205 |
+-embedded_libs="-L$pkglibdir@RPATH_OPTION@" |
206 |
++embedded_libs="-L$elibdir@RPATH_OPTION@" |
207 |
+ embedded_libs="$embedded_libs -l@LIBEMBED_OS_OUTPUT_NAME@ @CONFIG_EMBEDD_LIBS@" |
208 |
+ |
209 |
+ cflags="-I$pkgincludedir @CFLAGS@" libs="$libs @QUOTED_CMAKE_C_LINK_FLAGS@" |