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 A5B52198005 for ; Fri, 1 Mar 2013 02:47:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EA99E05A4; Fri, 1 Mar 2013 02:47:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AE58E05A4 for ; Fri, 1 Mar 2013 02:47:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2385933DC41 for ; Fri, 1 Mar 2013 02:47:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 565F4E41E2 for ; Fri, 1 Mar 2013 02:47:31 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1361987333.f15bfea3c776a0feee358c29ffa0859b75ba9ed7.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20003_all_fix-5.6-library.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: f15bfea3c776a0feee358c29ffa0859b75ba9ed7 X-VCS-Branch: master Date: Fri, 1 Mar 2013 02:47:31 +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: ecae295e-f890-4ea8-a7ed-74bb9cc66a4e X-Archives-Hash: a0aa5d15abe3e097b17c6930258e19f0 commit: f15bfea3c776a0feee358c29ffa0859b75ba9ed7 Author: Brian Evans lavabit com> AuthorDate: Wed Feb 27 17:48:53 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Feb 27 17:48:53 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=f15bfea3 Fix bad CMake references to zlib and readline in 5.6 --- 00000_index.txt | 5 +++++ 20003_all_fix-5.6-library.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index 5829392..25a2422 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1466,3 +1466,8 @@ @ver 5.06.00.00 to 5.99.99.99 @pn mysql @@ Bug 442000, upstream 62729 compilation failure on arm and possibly other arches where va_list is a struct or array. + +@patch 20003_all_fix-5.6-library.patch +@ver 5.06.00.00 to 5.99.99.99 +@pn mysql +@@ Fix bad references to zlib and readline upstream bugs 68277 and 68087 diff --git a/20003_all_fix-5.6-library.patch b/20003_all_fix-5.6-library.patch new file mode 100644 index 0000000..ab207e5 --- /dev/null +++ b/20003_all_fix-5.6-library.patch @@ -0,0 +1,26 @@ +--- mysql-5.6-5.6.9-rc+dfsg.orig/cmake/readline.cmake ++++ mysql-5.6-5.6.9-rc+dfsg/cmake/readline.cmake +@@ -192,9 +192,9 @@ MACRO (MYSQL_CHECK_READLINE) + IF(WITH_LIBEDIT) + MYSQL_USE_BUNDLED_LIBEDIT() + ELSE() +- FIND_SYSTEM_LIBEDIT(edit) +- IF(NOT_LIBEDIT_FOUND) +- MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") ++ FIND_SYSTEM_LIBEDIT(readline) ++ IF(NOT_LIBREADLINE_FOUND) ++ MESSAGE(FATAL_ERROR "Cannot find system libreadline libraries.Use WITH_LIBREADLINE") + ENDIF() + ENDIF() + ENDIF(NOT WIN32) +--- a/storage/perfschema/unittest/CMakeLists.txt 2013-02-27 10:45:29.559846643 -0500 ++++ b/storage/perfschema/unittest/CMakeLists.txt 2013-02-27 10:45:59.459430483 -0500 +@@ -63,7 +63,7 @@ + TARGET_LINK_LIBRARIES(pfs_connect_attr-t sql binlog rpl master slave sql) + TARGET_LINK_LIBRARIES(pfs_connect_attr-t mysys mysys_ssl) + TARGET_LINK_LIBRARIES(pfs_connect_attr-t vio ${SSL_LIBRARIES}) +-TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys zlib) ++TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys ${ZLIB_LIBRARY}) + ADD_TEST(pfs_connect_attr pfs_connect_attr-t) + + # On windows, pfs_connect_attr-t may depend on openssl dlls.