[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     b241546359a7dd72ad607be0480b456bac12bad8
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Feb 12 02:33:05 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 02:33:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=b2415463

Fix bad patch from previous commit

 20006_all_cmake_elib-mysql-5.6.29.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/20006_all_cmake_elib-mysql-5.6.29.patch 
b/20006_all_cmake_elib-mysql-5.6.29.patch
index 038f08b..0adb0ca 100644
--- a/20006_all_cmake_elib-mysql-5.6.29.patch
+++ b/20006_all_cmake_elib-mysql-5.6.29.patch
@@ -194,10 +194,10 @@ diff -aurN mysql.old/scripts/mysql_config.sh 
mysql/scripts/mysql_config.sh
  pkgincludedir='@pkgincludedir@'
  if [ -f "$basedir/include/mysql/mysql.h" ]; then
    pkgincludedir="$basedir/include/mysql"
-@@ -113,7 +117,7 @@
+@@ -116,7 +116,7 @@
  libs="$libs @QUOTED_CMAKE_C_LINK_FLAGS@"
  libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ 
@CLIENT_LIBS@ @openssl_libs@ "
- libs_r="$libs @QUOTED_CMAKE_C_LINK_FLAGS@"
+ libs_r="$libs_r @QUOTED_CMAKE_C_LINK_FLAGS@"
 -embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ 
@ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 +embedded_libs=" $ldflags -L$elibdir @RPATH_OPTION@ -lmysqld @LIBDL@ 
@ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
  embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"