diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2016-02-11 21:33:05 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2016-02-11 21:33:05 -0500 |
| commit | b241546359a7dd72ad607be0480b456bac12bad8 (patch) | |
| tree | 90ed0131019ad82fd98ffd16574205e680330e49 /20006_all_cmake_elib-mysql-5.6.29.patch | |
| parent | Respin embedded library patch for mysql-5.6.29 (diff) | |
| download | mysql-extras-b241546359a7dd72ad607be0480b456bac12bad8.tar.gz mysql-extras-b241546359a7dd72ad607be0480b456bac12bad8.tar.bz2 mysql-extras-b241546359a7dd72ad607be0480b456bac12bad8.zip | |
Fix bad patch from previous commitmysql-extras-20160212-0233Z
Diffstat (limited to '20006_all_cmake_elib-mysql-5.6.29.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mysql-5.6.29.patch | 4 |
1 files 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@" |