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 107BD138247 for ; Mon, 20 Jan 2014 01:35:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CEECE0E5D; Mon, 20 Jan 2014 01:35:19 +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 08531E0E5D for ; Mon, 20 Jan 2014 01:35:18 +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 0F63633F97B for ; Mon, 20 Jan 2014 01:35:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BB8021807D for ; Mon, 20 Jan 2014 01:35:16 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1390181385.fa30d8a6927b22d55104d8a18fd75d5ce8f98644.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20006_all_cmake_elib-mysql-5.5.35.patch X-VCS-Directories: / X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: fa30d8a6927b22d55104d8a18fd75d5ce8f98644 X-VCS-Branch: master Date: Mon, 20 Jan 2014 01:35:16 +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: 0e713c97-8d0c-4813-939a-adceee71f52f X-Archives-Hash: 1d125bf9d9d78534cbf7b14022db86ab commit: fa30d8a6927b22d55104d8a18fd75d5ce8f98644 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Mon Jan 20 01:29:45 2014 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Mon Jan 20 01:29:45 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=fa30d8a6 Update cmake_elib patch for mysql to fit the patch order. --- 20006_all_cmake_elib-mysql-5.5.35.patch | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/20006_all_cmake_elib-mysql-5.5.35.patch b/20006_all_cmake_elib-mysql-5.5.35.patch index fe92583..adcff93 100644 --- a/20006_all_cmake_elib-mysql-5.5.35.patch +++ b/20006_all_cmake_elib-mysql-5.5.35.patch @@ -1,6 +1,6 @@ diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake ---- mysql-old/cmake/install_layout.cmake 2014-01-19 20:22:12.883270532 -0100 -+++ mysql/cmake/install_layout.cmake 2014-01-19 20:30:54.488290367 -0100 +--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638 -0100 ++++ mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100 @@ -43,7 +43,8 @@ # - INSTALL_SBINDIR (directory with mysqld) # - INSTALL_SCRIPTDIR (several scripts, rarely used) @@ -57,8 +57,8 @@ diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}} CACHE STRING "${var} installation directory" ${FORCE}) diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake ---- mysql-old/cmake/libutils.cmake 2014-01-19 20:22:12.883270532 -0100 -+++ mysql/cmake/libutils.cmake 2014-01-19 20:33:38.821296616 -0100 +--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100 ++++ mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100 @@ -40,6 +40,8 @@ # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 .... linklibN] # [EXPORTS exported_func1 .... exported_func_N] @@ -89,10 +89,11 @@ diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake + ENDIF() ENDIF() SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") - ENDMACRO() + +Only in mysql/cmake: libutils.cmake.orig diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt ---- mysql-old/libmysql/CMakeLists.txt 2014-01-19 20:22:12.882270532 -0100 -+++ mysql/libmysql/CMakeLists.txt 2014-01-19 20:29:18.944286734 -0100 +--- mysql-old/libmysql/CMakeLists.txt 2014-01-20 00:14:06.580799638 -0100 ++++ mysql/libmysql/CMakeLists.txt 2014-01-20 00:15:27.647802721 -0100 @@ -165,7 +165,7 @@ # Merge several convenience libraries into one big mysqlclient @@ -103,8 +104,8 @@ diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt # Visual Studio users need debug static library for debug projects INSTALL_DEBUG_SYMBOLS(clientlib) diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt ---- mysql-old/libmysqld/CMakeLists.txt 2014-01-19 20:22:12.757270527 -0100 -+++ mysql/libmysqld/CMakeLists.txt 2014-01-19 20:35:39.362301200 -0100 +--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100 ++++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100 @@ -127,7 +127,7 @@ ENDFOREACH() @@ -114,19 +115,21 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt # Visual Studio users need debug static library IF(MSVC) -@@ -135,11 +135,13 @@ +@@ -135,12 +135,14 @@ ENDIF() IF(UNIX) - INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME + INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME -+ ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) ENDIF() - IF(MSVC AND NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} -- COMPONENT Embedded) + IF(NOT DISABLE_SHARED) +- MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}) ++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS} + COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR}) + - ENDIF() + IF(UNIX) + # Name the shared library, handle versioning (provides same api as client library + # hence the same version) +Only in mysql/libmysqld: CMakeLists.txt.rej