commit: c70f878ff23d999347f96d312ead0c8c56851684
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Sat Apr 26 01:25:54 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sat Apr 26 01:25:54 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=c70f878f
Fix embedded library location in ELIB patches for 5.5
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
---
20006_all_cmake_elib-mariadb-5.5.33.patch | 12 ++++++------
20006_all_cmake_elib-mysql-5.5.37.patch | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch
b/20006_all_cmake_elib-mariadb-5.5.33.patch
index ae6447f..5658444 100644
--- a/20006_all_cmake_elib-mariadb-5.5.33.patch
+++ b/20006_all_cmake_elib-mariadb-5.5.33.patch
@@ -152,8 +152,8 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt
---- a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400
-+++ b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400
++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400
@@ -198,6 +198,7 @@
SET(scriptdir ${prefix}/${INSTALL_BINDIR})
SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
@@ -163,8 +163,8 @@ diff -aurN a/mysql/scripts/CMakeLists.txt
b/mysql/scripts/CMakeLists.txt
SET(localstatedir ${prefix}/data)
ELSE()
diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
---- a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.000000000 -0400
-+++ b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.000000000 -0400
+--- mysql-old/scripts/mysql_config.pl.in 2014-04-15 07:02:39.000000000
-0400
++++ mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.000000000 -0400
@@ -190,9 +190,10 @@
else
{
@@ -178,8 +178,8 @@ diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
my $flags;
diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh
---- a/mysql/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400
-+++ b/mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400
+--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400
++++ mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400
@@ -91,6 +91,10 @@
plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
diff --git a/20006_all_cmake_elib-mysql-5.5.37.patch
b/20006_all_cmake_elib-mysql-5.5.37.patch
index d712067..1f328c2 100644
--- a/20006_all_cmake_elib-mysql-5.5.37.patch
+++ b/20006_all_cmake_elib-mysql-5.5.37.patch
@@ -171,8 +171,8 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
+ENDIF()
diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt
---- a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400
-+++ b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400
++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400
@@ -198,6 +198,7 @@
SET(scriptdir ${prefix}/${INSTALL_BINDIR})
SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
@@ -182,8 +182,8 @@ diff -aurN a/mysql/scripts/CMakeLists.txt
b/mysql/scripts/CMakeLists.txt
SET(localstatedir ${prefix}/data)
ELSE()
diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
---- a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.000000000 -0400
-+++ b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.000000000 -0400
+--- mysql-old/scripts/mysql_config.pl.in 2014-04-15 07:02:39.000000000
-0400
++++ mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.000000000 -0400
@@ -190,9 +190,10 @@
else
{
@@ -197,8 +197,8 @@ diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
my $flags;
diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh
---- a/mysql/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400
-+++ b/mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400
+--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400
++++ mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400
@@ -91,6 +91,10 @@
plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
