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 E2D2313857F for ; Sat, 19 Jan 2013 22:38:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FBB221C035; Sat, 19 Jan 2013 22:38:56 +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 D3C2321C035 for ; Sat, 19 Jan 2013 22:38:55 +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 E2AB133DAC3 for ; Sat, 19 Jan 2013 22:38:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 752E3E4077 for ; Sat, 19 Jan 2013 22:38:53 +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: <1358564400.8f0a7d31fef23582d4f3000d649d84ecba76ec9d.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 8f0a7d31fef23582d4f3000d649d84ecba76ec9d X-VCS-Branch: master Date: Sat, 19 Jan 2013 22:38: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: 10d69a9c-8d95-49a7-957d-09bb34ef47f0 X-Archives-Hash: 2c9a2c488e9d448be3cc78d1c069b4ce commit: 8f0a7d31fef23582d4f3000d649d84ecba76ec9d Author: Brian Evans lavabit com> AuthorDate: Sat Jan 19 03:00:00 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jan 19 03:00:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=8f0a7d31 Respin minimal patch for 5.5.29 --- 00000_index.txt | 5 ++ ..._all_fix-minimal-build-cmake-mysql-5.5.29.patch | 49 ++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index 132a663..dbee56e 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1427,6 +1427,11 @@ @pn mysql @@ Fix the minimal build by reordering CMakeLists.txt +@patch 20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch +@ver 5.05.29.00 to 5.05.99.99 +@pn mysql +@@ Fix the minimal build by reordering CMakeLists.txt + @patch 20001_all_fix-minimal-build-cmake-mariadb.patch @ver 5.05.00.00 to 5.05.26.99 @pn mariadb diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch b/20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch new file mode 100644 index 0000000..8c63678 --- /dev/null +++ b/20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch @@ -0,0 +1,49 @@ +--- CMakeLists.orig.txt 2013-01-18 16:58:34.701624830 -0500 ++++ CMakeLists.txt 2013-01-18 17:00:51.479636903 -0500 +@@ -294,7 +294,11 @@ + ADD_SUBDIRECTORY(regex) + ADD_SUBDIRECTORY(mysys) + ADD_SUBDIRECTORY(libmysql) +- ++ADD_SUBDIRECTORY(client) ++ADD_SUBDIRECTORY(libservices) ++ADD_SUBDIRECTORY(scripts) ++ADD_SUBDIRECTORY(sql/share) ++ADD_SUBDIRECTORY(support-files) + + IF(WITH_UNIT_TESTS) + ENABLE_TESTING() +@@ -307,10 +311,7 @@ + ADD_SUBDIRECTORY(extra) + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(tests) +- ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql) +- ADD_SUBDIRECTORY(sql/share) +- ADD_SUBDIRECTORY(libservices) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) + ADD_SUBDIRECTORY(libmysqld) +@@ -319,18 +320,17 @@ + + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) +- ADD_SUBDIRECTORY(support-files) +- ADD_SUBDIRECTORY(scripts) + ADD_SUBDIRECTORY(sql-bench) +- IF(UNIX) +- ADD_SUBDIRECTORY(man) +- ENDIF() + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal) + ENDIF() + ADD_SUBDIRECTORY(packaging/rpm-uln) + ENDIF() + ++IF(UNIX) ++ ADD_SUBDIRECTORY(man) ++ENDIF() ++ + INCLUDE(cmake/abi_check.cmake) + INCLUDE(cmake/tags.cmake) +