diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-10-19 15:21:45 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-10-19 15:21:45 -0400 |
| commit | f47d3e000fbd71427ed613cf9cbb27ca119ec6f1 (patch) | |
| tree | 547375c2f1d3f82264686d83b0bc5a7102c168fd /20006_all_cmake_elib-mysql-5.6.15.patch | |
| parent | Respin mysql_config cleanup for 5.6 (diff) | |
| download | mysql-extras-f47d3e000fbd71427ed613cf9cbb27ca119ec6f1.tar.gz mysql-extras-f47d3e000fbd71427ed613cf9cbb27ca119ec6f1.tar.bz2 mysql-extras-f47d3e000fbd71427ed613cf9cbb27ca119ec6f1.zip | |
Fix embedded lib paths for mysql_config in 5.6/10.0 series
Diffstat (limited to '20006_all_cmake_elib-mysql-5.6.15.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mysql-5.6.15.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/20006_all_cmake_elib-mysql-5.6.15.patch b/20006_all_cmake_elib-mysql-5.6.15.patch index 6e009ea..e1b1c4a 100644 --- a/20006_all_cmake_elib-mysql-5.6.15.patch +++ b/20006_all_cmake_elib-mysql-5.6.15.patch @@ -172,14 +172,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-14 15:07:28.000000000 -0400 +++ mysql/scripts/CMakeLists.txt 2014-04-25 22:46:35.000000000 -0400 -@@ -206,6 +206,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-14 15:07:28.000000000 -0400 +++ mysql/scripts/mysql_config.sh 2014-04-25 22:48:26.000000000 -0400 |