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 DA1F71389EA for ; Sun, 19 Oct 2014 19:21:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 317E9E08E6; Sun, 19 Oct 2014 19:21: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 B57BBE08E6 for ; Sun, 19 Oct 2014 19:21:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B257B34040A for ; Sun, 19 Oct 2014 19:21:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47436844F for ; Sun, 19 Oct 2014 19:21:53 +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: <1413746505.f47d3e000fbd71427ed613cf9cbb27ca119ec6f1.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20006_all_cmake_elib-mariadb-10.0.11.patch 20006_all_cmake_elib-mysql-5.6.15.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: f47d3e000fbd71427ed613cf9cbb27ca119ec6f1 X-VCS-Branch: master Date: Sun, 19 Oct 2014 19:21:53 +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: 724dad26-44d5-4a3d-8cb4-cd8340052898 X-Archives-Hash: cd433e4e53be8546a0deca0100efcfff commit: f47d3e000fbd71427ed613cf9cbb27ca119ec6f1 Author: Brian Evans tuffmail com> AuthorDate: Sun Oct 19 19:21:45 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Oct 19 19:21:45 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=f47d3e00 Fix embedded lib paths for mysql_config in 5.6/10.0 series --- 20006_all_cmake_elib-mariadb-10.0.11.patch | 16 ++++++++-------- 20006_all_cmake_elib-mysql-5.6.15.patch | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/20006_all_cmake_elib-mariadb-10.0.11.patch b/20006_all_cmake_elib-mariadb-10.0.11.patch index 5281bf5..e07a4c9 100644 --- a/20006_all_cmake_elib-mariadb-10.0.11.patch +++ b/20006_all_cmake_elib-mariadb-10.0.11.patch @@ -154,14 +154,14 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt --- 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}) - SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +@@ -236,6 +236,7 @@ + SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) + SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) + SET(localstatedir ${MYSQL_DATADIR}) +SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) - IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(localstatedir ${prefix}/data) - ELSE() + + SET(RPATH_OPTION "") + IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") diff -aurN mysql-old/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh --- 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 @@ -181,7 +181,7 @@ diff -aurN mysql-old/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh 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 -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.6.15.patch b/20006_all_cmake_elib-mysql-5.6.15.patch index 6e009ea..e1b1c4a 100644 --- a/20006_all_cmake_elib-mysql-5.6.15.patch +++ b/20006_all_cmake_elib-mysql-5.6.15.patch @@ -172,14 +172,14 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt diff -aurN mysql.old/scripts/CMakeLists.txt mysql/scripts/CMakeLists.txt --- mysql.old/scripts/CMakeLists.txt 2014-03-14 15:07:28.000000000 -0400 +++ mysql/scripts/CMakeLists.txt 2014-04-25 22:46:35.000000000 -0400 -@@ -206,6 +206,7 @@ - SET(scriptdir ${prefix}/${INSTALL_BINDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) - SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +@@ -239,6 +239,7 @@ + SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) + SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) + SET(localstatedir ${MYSQL_DATADIR}) +SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) - IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(localstatedir ${prefix}/data) - ELSE() + + SET(RPATH_OPTION "") + IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") diff -aurN mysql.old/scripts/mysql_config.sh mysql/scripts/mysql_config.sh --- mysql.old/scripts/mysql_config.sh 2014-03-14 15:07:28.000000000 -0400 +++ mysql/scripts/mysql_config.sh 2014-04-25 22:48:26.000000000 -0400