diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-10-21 13:41:03 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-10-21 13:41:03 -0400 |
| commit | 3f1fe4af81a297bf479b86646e11f4bee8f690cf (patch) | |
| tree | 7f5081349ba180e083a882862c12fd843d964b60 | |
| parent | Fix tokudb unique key false positive wrt bug 525912 (diff) | |
| download | mysql-extras-3f1fe4af81a297bf479b86646e11f4bee8f690cf.tar.gz mysql-extras-3f1fe4af81a297bf479b86646e11f4bee8f690cf.tar.bz2 mysql-extras-3f1fe4af81a297bf479b86646e11f4bee8f690cf.zip | |
Respin elib patch for percona to correct embedded lib pathsmysql-extras-20141021-1750Z
| -rw-r--r-- | 20006_all_cmake_elib-percona-5.6.19.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/20006_all_cmake_elib-percona-5.6.19.patch b/20006_all_cmake_elib-percona-5.6.19.patch index 65c348b..6f53e5c 100644 --- a/20006_all_cmake_elib-percona-5.6.19.patch +++ b/20006_all_cmake_elib-percona-5.6.19.patch @@ -173,14 +173,14 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt diff -aurN mysql.old/scripts/CMakeLists.txt mysql/scripts/CMakeLists.txt --- mysql.old/scripts/CMakeLists.txt 2014-03-25 09:10:46.000000000 -0400 +++ mysql/scripts/CMakeLists.txt 2014-04-25 23:19:05.544375123 -0400 -@@ -192,6 +192,7 @@ - SET(scriptdir ${prefix}/${INSTALL_BINDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) - SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +@@ -239,6 +239,7 @@ + SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) + SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) + SET(localstatedir ${MYSQL_DATADIR}) +SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) - IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(localstatedir ${prefix}/data) - ELSE() + + SET(RPATH_OPTION "") + IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") diff -aurN mysql.old/scripts/mysql_config.sh mysql/scripts/mysql_config.sh --- mysql.old/scripts/mysql_config.sh 2014-03-25 09:10:46.000000000 -0400 +++ mysql/scripts/mysql_config.sh 2014-04-25 23:21:36.030085686 -0400 |