diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-04-25 23:53:23 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-04-25 23:53:23 -0400 |
| commit | 67e9c375faa7e02492a170f856cb140f32d27e1f (patch) | |
| tree | cee4fd991ce4c2188ae047b164fb5f8ea34ec04b /20006_all_cmake_elib-percona-5.5.36.patch | |
| parent | Fix embedded library location in ELIB patches for 5.5 (diff) | |
| download | mysql-extras-67e9c375faa7e02492a170f856cb140f32d27e1f.tar.gz mysql-extras-67e9c375faa7e02492a170f856cb140f32d27e1f.tar.bz2 mysql-extras-67e9c375faa7e02492a170f856cb140f32d27e1f.zip | |
Fix embedded library location in ELIB patches for overlay only ebuilds
Signed-off-by: Brian Evans <grknight@tuffmail.com>
Diffstat (limited to '20006_all_cmake_elib-percona-5.5.36.patch')
| -rw-r--r-- | 20006_all_cmake_elib-percona-5.5.36.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/20006_all_cmake_elib-percona-5.5.36.patch b/20006_all_cmake_elib-percona-5.5.36.patch index 1536fc2..2160b0e 100644 --- a/20006_all_cmake_elib-percona-5.5.36.patch +++ b/20006_all_cmake_elib-percona-5.5.36.patch @@ -166,3 +166,37 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() +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}) ++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) + IF(INSTALL_LAYOUT MATCHES "STANDALONE") + SET(localstatedir ${prefix}/data) + ELSE() +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 +@@ -91,6 +91,10 @@ + plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` + fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin + ++elibdir='@elibdir@' ++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` ++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib ++ + pkgincludedir='@pkgincludedir@' + if [ -f "$basedir/include/mysql/mysql.h" ]; then + pkgincludedir="$basedir/include/mysql" +@@ -113,7 +117,7 @@ + libs=" $ldflags -L$pkglibdir -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " + libs_r=" $ldflags -L$pkglibdir -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " +-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs=" $ldflags -L$elibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC |