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 4D89713877A for ; Tue, 19 Aug 2014 12:17:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45530E09A1; Tue, 19 Aug 2014 12:17:20 +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 3614FE0979 for ; Tue, 19 Aug 2014 12:17:15 +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 0988034027C for ; Tue, 19 Aug 2014 12:17:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62EAF3A7E for ; Mon, 18 Aug 2014 23:37:36 +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: <1406922591.1b691ba4118d040ec73d7ef7984f0f79c73e4532.grknight@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.39.patch 20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 1b691ba4118d040ec73d7ef7984f0f79c73e4532 X-VCS-Branch: master Date: Mon, 18 Aug 2014 23:37:36 +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: 6440e92b-7052-4167-8a7b-fa5a473dea96 X-Archives-Hash: 6b1d286706d5de242114f4ec4f57cb60 commit: 1b691ba4118d040ec73d7ef7984f0f79c73e4532 Author: Brian Evans gentoo org> AuthorDate: Fri Aug 1 19:49:51 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Aug 1 19:49:51 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=1b691ba4 Respin minimal patches for new MySQL versions --- 00000_index.txt | 16 ++++++- ..._all_fix-minimal-build-cmake-mysql-5.5.39.patch | 49 ++++++++++++++++++++++ ..._all_fix-minimal-build-cmake-mysql-5.6.20.patch | 16 +++++++ 3 files changed, 79 insertions(+), 2 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index e9fb4a5..7051194 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1480,13 +1480,25 @@ @@ Fix the minimal build by reordering CMakeLists.txt @patch 20001_all_fix-minimal-build-cmake-mysql-5.5.36.patch -@ver 5.05.36.00 to 5.05.99.99 +@ver 5.05.36.00 to 5.05.38.99 +@pn mysql +@pn percona-server +@@ Fix the minimal build by reordering CMakeLists.txt + +@patch 20001_all_fix-minimal-build-cmake-mysql-5.5.39.patch +@ver 5.05.39.00 to 5.05.99.99 @pn mysql @pn percona-server @@ Fix the minimal build by reordering CMakeLists.txt @patch 20001_all_fix-minimal-build-cmake-mysql-5.6.patch -@ver 5.06.17.00 to 5.06.99.99 +@ver 5.06.17.00 to 5.06.19.99 +@pn mysql +@pn percona-server +@@ Fix the minimal build by reordering CMakeLists.txt + +@patch 20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch +@ver 5.06.20.00 to 5.06.99.99 @pn mysql @pn percona-server @@ Fix the minimal build by reordering CMakeLists.txt diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.5.39.patch b/20001_all_fix-minimal-build-cmake-mysql-5.5.39.patch new file mode 100644 index 0000000..cbd9598 --- /dev/null +++ b/20001_all_fix-minimal-build-cmake-mysql-5.5.39.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-oel) + ENDIF() + ++IF(UNIX) ++ ADD_SUBDIRECTORY(man) ++ENDIF() ++ + INCLUDE(cmake/abi_check.cmake) + INCLUDE(cmake/tags.cmake) + diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch b/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch new file mode 100644 index 0000000..8bee332 --- /dev/null +++ b/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch @@ -0,0 +1,16 @@ +diff -aurwN mysql.orig/CMakeLists.txt mysql/CMakeLists.txt +--- mysql.orig/CMakeLists.txt 2014-07-18 11:48:39.000000000 -0400 ++++ mysql/CMakeLists.txt 2014-08-01 12:54:52.612732241 -0400 +@@ -512,11 +512,11 @@ + # scripts/mysql_config depends on client and server targets loaded above. + # It is referenced by some of the directories below, so we insert it here. + ADD_SUBDIRECTORY(scripts) ++ADD_SUBDIRECTORY(support-files) + + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) +- ADD_SUBDIRECTORY(support-files) + ADD_SUBDIRECTORY(sql-bench) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal)