1 |
commit: b06e91caea912826ed728ca86263472bb66c743f |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 28 14:15:30 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 28 14:15:30 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=b06e91ca |
7 |
|
8 |
Respin elib patch for mariadb 10.0.26 |
9 |
|
10 |
20006_all_cmake_elib-mariadb-10.0.26.patch | 187 +++++++++++++++++++++++++++++ |
11 |
1 file changed, 187 insertions(+) |
12 |
|
13 |
diff --git a/20006_all_cmake_elib-mariadb-10.0.26.patch b/20006_all_cmake_elib-mariadb-10.0.26.patch |
14 |
new file mode 100644 |
15 |
index 0000000..d3acc99 |
16 |
--- /dev/null |
17 |
+++ b/20006_all_cmake_elib-mariadb-10.0.26.patch |
18 |
@@ -0,0 +1,187 @@ |
19 |
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake |
20 |
+--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470 -0100 |
21 |
++++ mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100 |
22 |
+@@ -44,7 +44,8 @@ |
23 |
+ # - INSTALL_SYSCONFDIR (my.cnf config file. Usually /etc or nothing) |
24 |
+ # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d) |
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 |
+@@ -120,6 +121,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/mysql") |
40 |
+@@ -150,9 +152,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 |
+@@ -183,6 +187,7 @@ |
53 |
+ SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d") |
54 |
+ # |
55 |
+ SET(INSTALL_LIBDIR_DEB "lib") |
56 |
++SET(INSTALL_ELIBDIR_DEB "lib") |
57 |
+ SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin") |
58 |
+ # |
59 |
+ SET(INSTALL_INCLUDEDIR_DEB "include/mysql") |
60 |
+@@ -210,6 +215,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/mysql") |
68 |
+@@ -241,7 +247,7 @@ |
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 SYSCONF SYSCONF2 |
73 |
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 |
74 |
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR) |
75 |
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}} |
76 |
+ CACHE STRING "${var} installation directory" ${FORCE}) |
77 |
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake |
78 |
+--- mysql-old/cmake/libutils.cmake 2014-01-18 22:28:40.430273470 -0100 |
79 |
++++ mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100 |
80 |
+@@ -211,10 +211,11 @@ |
81 |
+ # [linklib1 .... linklibN] |
82 |
+ # [EXPORTS exported_func1 .... exportedFuncN] |
83 |
+ # [OUTPUT_NAME output_name] |
84 |
++# [OUTPUT_DIR output_dir] |
85 |
+ #) |
86 |
+ MACRO(MERGE_LIBRARIES) |
87 |
+ MYSQL_PARSE_ARGUMENTS(ARG |
88 |
+- "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION" |
89 |
++ "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR" |
90 |
+ "STATIC;SHARED;MODULE;NOINSTALL" |
91 |
+ ${ARGN} |
92 |
+ ) |
93 |
+@@ -274,7 +275,11 @@ |
94 |
+ IF(ARG_COMPONENT) |
95 |
+ SET(COMP COMPONENT ${ARG_COMPONENT}) |
96 |
+ ENDIF() |
97 |
+- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
98 |
++ IF(ARG_OUTPUT_DIR) |
99 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP}) |
100 |
++ ELSE() |
101 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
102 |
++ ENDIF() |
103 |
+ ENDIF() |
104 |
+ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") |
105 |
+ IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED) |
106 |
+diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt |
107 |
+--- mysql-old/libmysql/CMakeLists.txt 2014-01-18 22:28:40.429273470 -0100 |
108 |
++++ mysql/libmysql/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 |
109 |
+@@ -327,9 +327,14 @@ |
110 |
+ |
111 |
+ SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) |
112 |
+ |
113 |
++SET(INSTALL_STATIC_LIBS "") |
114 |
++IF(NOT ENABLE_STATIC_LIBS) |
115 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
116 |
++ENDIF() |
117 |
++ |
118 |
+ # Merge several convenience libraries into one big mysqlclient |
119 |
+ # and link them together into shared library. |
120 |
+-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) |
121 |
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) |
122 |
+ |
123 |
+ # Visual Studio users need debug static library for debug projects |
124 |
+ IF(MSVC) |
125 |
+@@ -350,7 +355,9 @@ |
126 |
+ SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) |
127 |
+ ENDIF() |
128 |
+ ENDMACRO() |
129 |
+- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
130 |
++ IF(ENABLE_STATIC_LIBS) |
131 |
++ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
132 |
++ ENDIF() |
133 |
+ ENDIF() |
134 |
+ |
135 |
+ IF(NOT DISABLE_SHARED) |
136 |
+diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt |
137 |
+--- mysql-old/libmysqld/CMakeLists.txt 2014-01-18 22:28:40.090273457 -0100 |
138 |
++++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 |
139 |
+@@ -133,8 +133,13 @@ |
140 |
+ ENDIF() |
141 |
+ ENDFOREACH() |
142 |
+ |
143 |
++SET(INSTALL_STATIC_LIBS "") |
144 |
++IF(NOT ENABLE_STATIC_LIBS) |
145 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
146 |
++ENDIF() |
147 |
++ |
148 |
+ MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} |
149 |
+- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER}) |
150 |
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER} OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) |
151 |
+ |
152 |
+ INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) |
153 |
+ |
154 |
+@@ -144,7 +149,7 @@ |
155 |
+ ENDIF() |
156 |
+ |
157 |
+ IF(UNIX) |
158 |
+- INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME |
159 |
++ INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME |
160 |
+ ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) |
161 |
+ ENDIF() |
162 |
+ |
163 |
+@@ -163,7 +168,7 @@ |
164 |
+ |
165 |
+ IF(NOT DISABLE_SHARED) |
166 |
+ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API} |
167 |
+- COMPONENT ${COMPONENT_LIBMYSQLD}) |
168 |
++ COMPONENT ${COMPONENT_LIBMYSQLD} OUTPUT_DIR ${INSTALL_ELIBDIR}) |
169 |
+ IF(UNIX) |
170 |
+ # Name the shared library, handle versioning (provides same api as client |
171 |
+ # library hence the same version) |
172 |
+diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt |
173 |
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400 |
174 |
++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400 |
175 |
+@@ -236,6 +236,7 @@ |
176 |
+ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) |
177 |
+ SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) |
178 |
+ SET(localstatedir ${MYSQL_DATADIR}) |
179 |
++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) |
180 |
+ |
181 |
+ SET(RPATH_OPTION "") |
182 |
+ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") |
183 |
+diff -aurN mysql-old/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh |
184 |
+--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400 |
185 |
++++ mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400 |
186 |
+@@ -91,6 +91,10 @@ |
187 |
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` |
188 |
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin |
189 |
+ |
190 |
++elibdir='@elibdir@' |
191 |
++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` |
192 |
++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib |
193 |
++ |
194 |
+ pkgincludedir='@pkgincludedir@' |
195 |
+ fix_path pkgincludedir include/mysql |
196 |
+ |
197 |
+@@ -109,7 +113,7 @@ |
198 |
+ libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
199 |
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " |
200 |
+ libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " |
201 |
+-embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
202 |
++embedded_libs=" $ldflags -L$elibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
203 |
+ |
204 |
+ if [ -r "$pkglibdir/libmygcc.a" ]; then |
205 |
+ # When linking against the static library with a different version of GCC |