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 E4AA1138A1F for ; Sat, 26 Apr 2014 00:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80378E0869; Sat, 26 Apr 2014 00:57:57 +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 C3ED3E0869 for ; Sat, 26 Apr 2014 00:57:56 +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 A5F4633FE9E for ; Sat, 26 Apr 2014 00:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 187DC1818D for ; Sat, 26 Apr 2014 00:57:50 +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: <1398473855.d2a5ec77e428e6a0413c7fcbe6e6bc7e2e6f6667.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: d2a5ec77e428e6a0413c7fcbe6e6bc7e2e6f6667 X-VCS-Branch: master Date: Sat, 26 Apr 2014 00:57:50 +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: b5b05292-b470-47b2-bf5e-00c99d9edce2 X-Archives-Hash: c055f71efe3999b8df32463f0bec3a86 commit: d2a5ec77e428e6a0413c7fcbe6e6bc7e2e6f6667 Author: Brian Evans tuffmail com> AuthorDate: Sat Apr 26 00:57:35 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Sat Apr 26 00:57:35 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=d2a5ec77 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 | 49 +++++++++++++++++++++++++++++++ 20006_all_cmake_elib-mysql-5.5.37.patch | 49 +++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch b/20006_all_cmake_elib-mariadb-5.5.33.patch index 33e902b..ae6447f 100644 --- a/20006_all_cmake_elib-mariadb-5.5.33.patch +++ b/20006_all_cmake_elib-mariadb-5.5.33.patch @@ -151,3 +151,52 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt IF(UNIX) # 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 +@@ -198,6 +198,7 @@ + SET(scriptdir ${prefix}/${INSTALL_BINDIR}) + SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) + SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) ++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) + IF(INSTALL_LAYOUT MATCHES "STANDALONE") + 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 +@@ -190,9 +190,10 @@ + else + { + my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; ++ my $elinkpath = "-L@elibdir@ @RPATH_OPTION@"; + @lib_opts = ($linkpath,"-lmysqlclient"); + @lib_r_opts = ($linkpath,"-lmysqlclient_r"); +- @lib_e_opts = ($linkpath,"-lmysqld"); ++ @lib_e_opts = ($elinkpath,"-lmysqld"); + } + + 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 +@@ -91,6 +91,10 @@ + plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` + fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin + ++elibdir='@elibdir@' ++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` ++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib ++ + pkgincludedir='@pkgincludedir@' + fix_path pkgincludedir include/mysql + +@@ -109,7 +113,7 @@ + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_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 diff --git a/20006_all_cmake_elib-mysql-5.5.37.patch b/20006_all_cmake_elib-mysql-5.5.37.patch index a56805c..d712067 100644 --- a/20006_all_cmake_elib-mysql-5.5.37.patch +++ b/20006_all_cmake_elib-mysql-5.5.37.patch @@ -170,3 +170,52 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +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 +@@ -198,6 +198,7 @@ + SET(scriptdir ${prefix}/${INSTALL_BINDIR}) + SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) + SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) ++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) + IF(INSTALL_LAYOUT MATCHES "STANDALONE") + 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 +@@ -190,9 +190,10 @@ + else + { + my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; ++ my $elinkpath = "-L@elibdir@ @RPATH_OPTION@"; + @lib_opts = ($linkpath,"-lmysqlclient"); + @lib_r_opts = ($linkpath,"-lmysqlclient_r"); +- @lib_e_opts = ($linkpath,"-lmysqld"); ++ @lib_e_opts = ($elinkpath,"-lmysqld"); + } + + 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 +@@ -91,6 +91,10 @@ + plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` + fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin + ++elibdir='@elibdir@' ++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` ++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib ++ + pkgincludedir='@pkgincludedir@' + fix_path pkgincludedir include/mysql + +@@ -109,7 +113,7 @@ + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_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