1 |
commit: 7d93bfc0691a5cd825edd54876e6d6ad95222dd9 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 6 19:37:28 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Tue May 6 19:37:28 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=7d93bfc0 |
7 |
|
8 |
Small fix to last patch |
9 |
|
10 |
--- |
11 |
20006_all_cmake_elib-percona-5.5.37.patch | 8 ++++---- |
12 |
1 file changed, 4 insertions(+), 4 deletions(-) |
13 |
|
14 |
diff --git a/20006_all_cmake_elib-percona-5.5.37.patch b/20006_all_cmake_elib-percona-5.5.37.patch |
15 |
index 557f932..5bc5d97 100644 |
16 |
--- a/20006_all_cmake_elib-percona-5.5.37.patch |
17 |
+++ b/20006_all_cmake_elib-percona-5.5.37.patch |
18 |
@@ -190,11 +190,11 @@ diff -aurN mysql.old/scripts/mysql_config.sh mysql/scripts/mysql_config.sh |
19 |
if [ -f "$basedir/include/mysql/mysql.h" ]; then |
20 |
pkgincludedir="$basedir/include/mysql" |
21 |
@@ -113,7 +117,7 @@ |
22 |
- libs=" $ldflags -L$pkglibdir -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
23 |
+ libs=" $ldflags @RPATH_OPTION@ -L$pkglibdir -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
24 |
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " |
25 |
- libs_r=" $ldflags -L$pkglibdir -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " |
26 |
--embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
27 |
-+embedded_libs=" $ldflags -L$elibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
28 |
+ libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " |
29 |
+-embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
30 |
++embedded_libs=" $ldflags -L$elibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
31 |
|
32 |
if [ -r "$pkglibdir/libmygcc.a" ]; then |
33 |
# When linking against the static library with a different version of GCC |