| 1 |
commit: 544d1a2e4ec9800d6926200401017f89f98d911d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 26 13:18:08 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 26 13:18:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=544d1a2e |
| 7 |
|
| 8 |
Respin elib patch for new versions |
| 9 |
|
| 10 |
20006_all_cmake_elib-mariadb-10.0.33.patch | 178 +++++++++++++++++++++++++++++ |
| 11 |
20006_all_cmake_elib-mariadb-10.1.27.patch | 178 +++++++++++++++++++++++++++++ |
| 12 |
2 files changed, 356 insertions(+) |
| 13 |
|
| 14 |
diff --git a/20006_all_cmake_elib-mariadb-10.0.33.patch b/20006_all_cmake_elib-mariadb-10.0.33.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..03e94a9 |
| 17 |
--- /dev/null |
| 18 |
+++ b/20006_all_cmake_elib-mariadb-10.0.33.patch |
| 19 |
@@ -0,0 +1,178 @@ |
| 20 |
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake |
| 21 |
+--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470 -0100 |
| 22 |
++++ mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100 |
| 23 |
+@@ -44,7 +44,8 @@ |
| 24 |
+ # - INSTALL_SYSCONFDIR (my.cnf config file. Usually /etc or nothing) |
| 25 |
+ # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d) |
| 26 |
+ # |
| 27 |
+-# - INSTALL_LIBDIR (directory with client end embedded libraries) |
| 28 |
++# - INSTALL_LIBDIR (directory with client libraries) |
| 29 |
++# - INSTALL_ELIBDIR (directory with embedded libraries) |
| 30 |
+ # - INSTALL_PLUGINDIR (directory for plugins) |
| 31 |
+ # |
| 32 |
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers) |
| 33 |
+@@ -120,6 +121,7 @@ |
| 34 |
+ SET(INSTALL_SCRIPTDIR_STANDALONE "scripts") |
| 35 |
+ # |
| 36 |
+ SET(INSTALL_LIBDIR_STANDALONE "lib") |
| 37 |
++SET(INSTALL_ELIBDIR_STANDALONE "lib") |
| 38 |
+ SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") |
| 39 |
+ # |
| 40 |
+ SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql") |
| 41 |
+@@ -150,9 +152,11 @@ |
| 42 |
+ # |
| 43 |
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") |
| 44 |
+ SET(INSTALL_LIBDIR_RPM "lib64") |
| 45 |
++ SET(INSTALL_ELIBDIR_RPM "lib64") |
| 46 |
+ SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") |
| 47 |
+ ELSE() |
| 48 |
+ SET(INSTALL_LIBDIR_RPM "lib") |
| 49 |
++ SET(INSTALL_ELIBDIR_RPM "lib") |
| 50 |
+ SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin") |
| 51 |
+ ENDIF() |
| 52 |
+ # |
| 53 |
+@@ -183,6 +187,7 @@ |
| 54 |
+ SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d") |
| 55 |
+ # |
| 56 |
+ SET(INSTALL_LIBDIR_DEB "lib") |
| 57 |
++SET(INSTALL_ELIBDIR_DEB "lib") |
| 58 |
+ SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin") |
| 59 |
+ # |
| 60 |
+ SET(INSTALL_INCLUDEDIR_DEB "include/mysql") |
| 61 |
+@@ -210,6 +215,7 @@ |
| 62 |
+ SET(INSTALL_SCRIPTDIR_SVR4 "scripts") |
| 63 |
+ # |
| 64 |
+ SET(INSTALL_LIBDIR_SVR4 "lib") |
| 65 |
++SET(INSTALL_ELIBDIR_SVR4 "lib") |
| 66 |
+ SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin") |
| 67 |
+ # |
| 68 |
+ SET(INSTALL_INCLUDEDIR_SVR4 "include/mysql") |
| 69 |
+@@ -241,7 +247,7 @@ |
| 70 |
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR |
| 71 |
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE |
| 72 |
+ # layout is chosen) |
| 73 |
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 |
| 74 |
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 |
| 75 |
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR) |
| 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-18 22:28:40.430273470 -0100 |
| 80 |
++++ mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100 |
| 81 |
+@@ -211,10 +211,11 @@ |
| 82 |
+ # [linklib1 .... linklibN] |
| 83 |
+ # [EXPORTS exported_func1 .... exportedFuncN] |
| 84 |
+ # [OUTPUT_NAME output_name] |
| 85 |
++# [OUTPUT_DIR output_dir] |
| 86 |
+ #) |
| 87 |
+ MACRO(MERGE_LIBRARIES) |
| 88 |
+ MYSQL_PARSE_ARGUMENTS(ARG |
| 89 |
+- "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION" |
| 90 |
++ "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR" |
| 91 |
+ "STATIC;SHARED;MODULE;NOINSTALL" |
| 92 |
+ ${ARGN} |
| 93 |
+ ) |
| 94 |
+@@ -274,7 +275,11 @@ |
| 95 |
+ IF(ARG_COMPONENT) |
| 96 |
+ SET(COMP COMPONENT ${ARG_COMPONENT}) |
| 97 |
+ ENDIF() |
| 98 |
+- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
| 99 |
++ IF(ARG_OUTPUT_DIR) |
| 100 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP}) |
| 101 |
++ ELSE() |
| 102 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
| 103 |
++ ENDIF() |
| 104 |
+ ENDIF() |
| 105 |
+ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") |
| 106 |
+ IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED) |
| 107 |
+diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt |
| 108 |
+--- mysql-old/libmysql/CMakeLists.txt 2014-01-18 22:28:40.429273470 -0100 |
| 109 |
++++ mysql/libmysql/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 |
| 110 |
+@@ -327,9 +327,14 @@ |
| 111 |
+ |
| 112 |
+ SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) |
| 113 |
+ |
| 114 |
++SET(INSTALL_STATIC_LIBS "") |
| 115 |
++IF(NOT ENABLE_STATIC_LIBS) |
| 116 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
| 117 |
++ENDIF() |
| 118 |
++ |
| 119 |
+ # Merge several convenience libraries into one big mysqlclient |
| 120 |
+ # and link them together into shared library. |
| 121 |
+-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) |
| 122 |
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) |
| 123 |
+ |
| 124 |
+ # Visual Studio users need debug static library for debug projects |
| 125 |
+ IF(MSVC) |
| 126 |
+@@ -350,7 +355,9 @@ |
| 127 |
+ SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) |
| 128 |
+ ENDIF() |
| 129 |
+ ENDMACRO() |
| 130 |
+- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
| 131 |
++ IF(ENABLE_STATIC_LIBS) |
| 132 |
++ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
| 133 |
++ ENDIF() |
| 134 |
+ ENDIF() |
| 135 |
+ |
| 136 |
+ IF(NOT DISABLE_SHARED) |
| 137 |
+diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt |
| 138 |
+--- mysql-old/libmysqld/CMakeLists.txt 2014-01-18 22:28:40.090273457 -0100 |
| 139 |
++++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 |
| 140 |
+@@ -133,8 +133,13 @@ |
| 141 |
+ ENDIF() |
| 142 |
+ ENDFOREACH() |
| 143 |
+ |
| 144 |
++SET(INSTALL_STATIC_LIBS "") |
| 145 |
++IF(NOT ENABLE_STATIC_LIBS) |
| 146 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
| 147 |
++ENDIF() |
| 148 |
++ |
| 149 |
+ MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} |
| 150 |
+- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER}) |
| 151 |
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER} OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) |
| 152 |
+ |
| 153 |
+ INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) |
| 154 |
+ |
| 155 |
+@@ -163,7 +168,7 @@ |
| 156 |
+ |
| 157 |
+ IF(NOT DISABLE_SHARED) |
| 158 |
+ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API} |
| 159 |
+- COMPONENT ${COMPONENT_LIBMYSQLD}) |
| 160 |
++ COMPONENT ${COMPONENT_LIBMYSQLD} OUTPUT_DIR ${INSTALL_ELIBDIR}) |
| 161 |
+ IF(UNIX) |
| 162 |
+ # Name the shared library, handle versioning (provides same api as client |
| 163 |
+ # library hence the same version) |
| 164 |
+diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt |
| 165 |
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400 |
| 166 |
++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400 |
| 167 |
+@@ -236,6 +236,7 @@ |
| 168 |
+ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) |
| 169 |
+ SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) |
| 170 |
+ SET(localstatedir ${MYSQL_DATADIR}) |
| 171 |
++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) |
| 172 |
+ |
| 173 |
+ SET(RPATH_OPTION "") |
| 174 |
+ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") |
| 175 |
+diff -aurN mysql-old/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh |
| 176 |
+--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400 |
| 177 |
++++ mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400 |
| 178 |
+@@ -91,6 +91,10 @@ |
| 179 |
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` |
| 180 |
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin |
| 181 |
+ |
| 182 |
++elibdir='@elibdir@' |
| 183 |
++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` |
| 184 |
++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib |
| 185 |
++ |
| 186 |
+ pkgincludedir='@pkgincludedir@' |
| 187 |
+ fix_path pkgincludedir include/mysql |
| 188 |
+ |
| 189 |
+@@ -109,7 +113,7 @@ |
| 190 |
+ libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
| 191 |
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " |
| 192 |
+ libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " |
| 193 |
+-embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
| 194 |
++embedded_libs=" $ldflags -L$elibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
| 195 |
+ |
| 196 |
+ if [ -r "$pkglibdir/libmygcc.a" ]; then |
| 197 |
+ # When linking against the static library with a different version of GCC |
| 198 |
|
| 199 |
diff --git a/20006_all_cmake_elib-mariadb-10.1.27.patch b/20006_all_cmake_elib-mariadb-10.1.27.patch |
| 200 |
new file mode 100644 |
| 201 |
index 0000000..f93db99 |
| 202 |
--- /dev/null |
| 203 |
+++ b/20006_all_cmake_elib-mariadb-10.1.27.patch |
| 204 |
@@ -0,0 +1,178 @@ |
| 205 |
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake |
| 206 |
+--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470 -0100 |
| 207 |
++++ mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100 |
| 208 |
+@@ -44,7 +44,8 @@ |
| 209 |
+ # - INSTALL_SYSCONFDIR (my.cnf config file. Usually /etc or nothing) |
| 210 |
+ # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d) |
| 211 |
+ # |
| 212 |
+-# - INSTALL_LIBDIR (directory with client end embedded libraries) |
| 213 |
++# - INSTALL_LIBDIR (directory with client libraries) |
| 214 |
++# - INSTALL_ELIBDIR (directory with embedded libraries) |
| 215 |
+ # - INSTALL_PLUGINDIR (directory for plugins) |
| 216 |
+ # |
| 217 |
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers) |
| 218 |
+@@ -120,6 +121,7 @@ |
| 219 |
+ SET(INSTALL_SCRIPTDIR_STANDALONE "scripts") |
| 220 |
+ # |
| 221 |
+ SET(INSTALL_LIBDIR_STANDALONE "lib") |
| 222 |
++SET(INSTALL_ELIBDIR_STANDALONE "lib") |
| 223 |
+ SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") |
| 224 |
+ # |
| 225 |
+ SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql") |
| 226 |
+@@ -150,9 +152,11 @@ |
| 227 |
+ # |
| 228 |
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") |
| 229 |
+ SET(INSTALL_LIBDIR_RPM "lib64") |
| 230 |
++ SET(INSTALL_ELIBDIR_RPM "lib64") |
| 231 |
+ SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") |
| 232 |
+ ELSE() |
| 233 |
+ SET(INSTALL_LIBDIR_RPM "lib") |
| 234 |
++ SET(INSTALL_ELIBDIR_RPM "lib") |
| 235 |
+ SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin") |
| 236 |
+ ENDIF() |
| 237 |
+ # |
| 238 |
+@@ -183,6 +187,7 @@ |
| 239 |
+ SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d") |
| 240 |
+ # |
| 241 |
+ SET(INSTALL_LIBDIR_DEB "lib") |
| 242 |
++SET(INSTALL_ELIBDIR_DEB "lib") |
| 243 |
+ SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin") |
| 244 |
+ # |
| 245 |
+ SET(INSTALL_INCLUDEDIR_DEB "include/mysql") |
| 246 |
+@@ -210,6 +215,7 @@ |
| 247 |
+ SET(INSTALL_SCRIPTDIR_SVR4 "scripts") |
| 248 |
+ # |
| 249 |
+ SET(INSTALL_LIBDIR_SVR4 "lib") |
| 250 |
++SET(INSTALL_ELIBDIR_SVR4 "lib") |
| 251 |
+ SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin") |
| 252 |
+ # |
| 253 |
+ SET(INSTALL_INCLUDEDIR_SVR4 "include/mysql") |
| 254 |
+@@ -241,7 +247,7 @@ |
| 255 |
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR |
| 256 |
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE |
| 257 |
+ # layout is chosen) |
| 258 |
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 |
| 259 |
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 |
| 260 |
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR |
| 261 |
+ SYSTEMD_UNIT) |
| 262 |
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}} |
| 263 |
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake |
| 264 |
+--- mysql-old/cmake/libutils.cmake 2014-01-18 22:28:40.430273470 -0100 |
| 265 |
++++ mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100 |
| 266 |
+@@ -211,10 +211,11 @@ |
| 267 |
+ # [linklib1 .... linklibN] |
| 268 |
+ # [EXPORTS exported_func1 .... exportedFuncN] |
| 269 |
+ # [OUTPUT_NAME output_name] |
| 270 |
++# [OUTPUT_DIR output_dir] |
| 271 |
+ #) |
| 272 |
+ MACRO(MERGE_LIBRARIES) |
| 273 |
+ MYSQL_PARSE_ARGUMENTS(ARG |
| 274 |
+- "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION" |
| 275 |
++ "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR" |
| 276 |
+ "STATIC;SHARED;MODULE;NOINSTALL" |
| 277 |
+ ${ARGN} |
| 278 |
+ ) |
| 279 |
+@@ -274,7 +275,11 @@ |
| 280 |
+ IF(ARG_COMPONENT) |
| 281 |
+ SET(COMP COMPONENT ${ARG_COMPONENT}) |
| 282 |
+ ENDIF() |
| 283 |
+- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
| 284 |
++ IF(ARG_OUTPUT_DIR) |
| 285 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP}) |
| 286 |
++ ELSE() |
| 287 |
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) |
| 288 |
++ ENDIF() |
| 289 |
+ ENDIF() |
| 290 |
+ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") |
| 291 |
+ IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED) |
| 292 |
+diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt |
| 293 |
+--- mysql-old/libmysql/CMakeLists.txt 2014-01-18 22:28:40.429273470 -0100 |
| 294 |
++++ mysql/libmysql/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 |
| 295 |
+@@ -327,9 +327,14 @@ |
| 296 |
+ |
| 297 |
+ SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) |
| 298 |
+ |
| 299 |
++SET(INSTALL_STATIC_LIBS "") |
| 300 |
++IF(NOT ENABLE_STATIC_LIBS) |
| 301 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
| 302 |
++ENDIF() |
| 303 |
++ |
| 304 |
+ # Merge several convenience libraries into one big mysqlclient |
| 305 |
+ # and link them together into shared library. |
| 306 |
+-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) |
| 307 |
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) |
| 308 |
+ |
| 309 |
+ # Visual Studio users need debug static library for debug projects |
| 310 |
+ IF(MSVC) |
| 311 |
+@@ -350,7 +355,9 @@ |
| 312 |
+ SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) |
| 313 |
+ ENDIF() |
| 314 |
+ ENDMACRO() |
| 315 |
+- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
| 316 |
++ IF(ENABLE_STATIC_LIBS) |
| 317 |
++ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
| 318 |
++ ENDIF() |
| 319 |
+ ENDIF() |
| 320 |
+ |
| 321 |
+ IF(NOT DISABLE_SHARED) |
| 322 |
+diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt |
| 323 |
+--- mysql-old/libmysqld/CMakeLists.txt 2014-01-18 22:28:40.090273457 -0100 |
| 324 |
++++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 |
| 325 |
+@@ -133,8 +133,13 @@ |
| 326 |
+ ENDIF() |
| 327 |
+ ENDFOREACH() |
| 328 |
+ |
| 329 |
++SET(INSTALL_STATIC_LIBS "") |
| 330 |
++IF(NOT ENABLE_STATIC_LIBS) |
| 331 |
++ SET(INSTALL_STATIC_LIBS "NOINSTALL") |
| 332 |
++ENDIF() |
| 333 |
++ |
| 334 |
+ MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} |
| 335 |
+- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER}) |
| 336 |
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER} OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) |
| 337 |
+ |
| 338 |
+ INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT ${COMPONENT_MYSQLSERVER}) |
| 339 |
+ |
| 340 |
+@@ -163,7 +167,7 @@ |
| 341 |
+ |
| 342 |
+ IF(NOT DISABLE_SHARED) |
| 343 |
+ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API} |
| 344 |
+- COMPONENT ${COMPONENT_LIBMYSQLD}) |
| 345 |
++ COMPONENT ${COMPONENT_LIBMYSQLD} OUTPUT_DIR ${INSTALL_ELIBDIR}) |
| 346 |
+ IF(UNIX) |
| 347 |
+ # Name the shared library, handle versioning (provides same api as client |
| 348 |
+ # library hence the same version) |
| 349 |
+diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt |
| 350 |
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400 |
| 351 |
++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400 |
| 352 |
+@@ -236,6 +236,7 @@ |
| 353 |
+ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) |
| 354 |
+ SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) |
| 355 |
+ SET(localstatedir ${MYSQL_DATADIR}) |
| 356 |
++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) |
| 357 |
+ |
| 358 |
+ SET(RPATH_OPTION "") |
| 359 |
+ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") |
| 360 |
+diff -aurN mysql.orig/scripts/mysql_config.sh mysql/scripts/mysql_config.sh |
| 361 |
+--- mysql.orig/scripts/mysql_config.sh 2014-10-15 18:53:51.000000000 -0400 |
| 362 |
++++ mysql/scripts/mysql_config.sh 2014-10-22 16:17:02.590868620 -0400 |
| 363 |
+@@ -92,6 +92,10 @@ |
| 364 |
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` |
| 365 |
+ fix_path plugindir $plugindir_rel @libsubdir@/mysql/plugin @libsubdir@/plugin |
| 366 |
+ |
| 367 |
++elibdir='@elibdir@' |
| 368 |
++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` |
| 369 |
++fix_path elibdir $elibdir_rel @libsubdir@/mysql @libsubdir@ |
| 370 |
++ |
| 371 |
+ pkgincludedir='@pkgincludedir@' |
| 372 |
+ fix_path pkgincludedir include/mysql |
| 373 |
+ |
| 374 |
+@@ -106,7 +110,7 @@ |
| 375 |
+ |
| 376 |
+ # Create options |
| 377 |
+ libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" |
| 378 |
+-embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" |
| 379 |
++embedded_libs="-L$elibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" |
| 380 |
+ |
| 381 |
+ include="-I$pkgincludedir" |
| 382 |
+ if [ "$basedir" != "/usr" ]; then |
Archives