diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-05-06 15:37:28 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-05-06 15:37:28 -0400 |
| commit | 7d93bfc0691a5cd825edd54876e6d6ad95222dd9 (patch) | |
| tree | 7fa0bff00796ad283bde3815a5d9d8eab83af181 /20006_all_cmake_elib-percona-5.5.37.patch | |
| parent | Respon elib patch for percona 5.5.37 (diff) | |
| download | mysql-extras-7d93bfc0691a5cd825edd54876e6d6ad95222dd9.tar.gz mysql-extras-7d93bfc0691a5cd825edd54876e6d6ad95222dd9.tar.bz2 mysql-extras-7d93bfc0691a5cd825edd54876e6d6ad95222dd9.zip | |
Small fix to last patchmysql-extras-20140509-0130Z
Diffstat (limited to '20006_all_cmake_elib-percona-5.5.37.patch')
| -rw-r--r-- | 20006_all_cmake_elib-percona-5.5.37.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/20006_all_cmake_elib-percona-5.5.37.patch b/20006_all_cmake_elib-percona-5.5.37.patch index 557f932..5bc5d97 100644 --- a/20006_all_cmake_elib-percona-5.5.37.patch +++ b/20006_all_cmake_elib-percona-5.5.37.patch @@ -190,11 +190,11 @@ diff -aurN mysql.old/scripts/mysql_config.sh mysql/scripts/mysql_config.sh 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=" $ldflags @RPATH_OPTION@ -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@ " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " +-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@ " if [ -r "$pkglibdir/libmygcc.a" ]; then # When linking against the static library with a different version of GCC |