From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8007C138A1F for ; Sat, 26 Apr 2014 01:26:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4313CE09DE; Sat, 26 Apr 2014 01:26:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 935D5E09DE for ; Sat, 26 Apr 2014 01:26:07 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EAF833FD25 for ; Sat, 26 Apr 2014 01:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D24581818D for ; Sat, 26 Apr 2014 01:26:02 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1398475554.c70f878ff23d999347f96d312ead0c8c56851684.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20006_all_cmake_elib-mariadb-5.5.33.patch 20006_all_cmake_elib-mysql-5.5.37.patch X-VCS-Directories: / X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: c70f878ff23d999347f96d312ead0c8c56851684 X-VCS-Branch: master Date: Sat, 26 Apr 2014 01:26:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 37de3d53-5125-455b-9fd2-4e0bccfe4815 X-Archives-Hash: 9573a42fe3218197192e404ffd306c10 commit: c70f878ff23d999347f96d312ead0c8c56851684 Author: Brian Evans tuffmail com> AuthorDate: Sat Apr 26 01:25:54 2014 +0000 Commit: Brian Evans lavabit 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 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