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 178471387FD for ; Mon, 31 Mar 2014 18:05:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1A0BE0AA0; Mon, 31 Mar 2014 18:05:40 +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 5E620E0AA0 for ; Mon, 31 Mar 2014 18:05:40 +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 5C7C633EE5B for ; Mon, 31 Mar 2014 18:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1743B188A2 for ; Mon, 31 Mar 2014 18:05:38 +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: <1396289123.c6fec9cf21f30d91c9b00711f501bada8f37b9f7.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-percona-5.6.16.patch X-VCS-Directories: / X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: c6fec9cf21f30d91c9b00711f501bada8f37b9f7 X-VCS-Branch: master Date: Mon, 31 Mar 2014 18:05:38 +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: 88817d10-ccaf-4b43-a3cc-d8316e7e252b X-Archives-Hash: 8a8fa3056a6232dcfb1280f011819e8f commit: c6fec9cf21f30d91c9b00711f501bada8f37b9f7 Author: Brian Evans tuffmail com> AuthorDate: Mon Mar 31 18:05:23 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Mon Mar 31 18:05:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=c6fec9cf Fix bad percona patch for 5.6.16 --- 20006_all_cmake_elib-percona-5.6.16.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/20006_all_cmake_elib-percona-5.6.16.patch b/20006_all_cmake_elib-percona-5.6.16.patch index 608daad..b1a2a0b 100644 --- a/20006_all_cmake_elib-percona-5.6.16.patch +++ b/20006_all_cmake_elib-percona-5.6.16.patch @@ -104,19 +104,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt + # Merge several convenience libraries into one big perconaserverclient -MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} $INSTALL_STATIC_LIBS}) ++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) # Visual Studio users need debug static library for debug projects INSTALL_DEBUG_SYMBOLS(clientlib) -@@ -210,10 +215,12 @@ +@@ -210,9 +215,11 @@ ENDIF() IF(UNIX) -- GET_TARGET_NAME(perconaserverclient lib_name) + GET_TARGET_NAME(perconaserverclient lib_name) - INSTALL_SYMLINK(perconaserverclient - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a - ${INSTALL_LIBDIR} Development) -+ GET_TARGET_NAME(perconaserverclient lib_name)\ + IF(ENABLE_STATIC_LIBS) + INSTALL_SYMLINK(perconaserverclient + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a