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 1A75A138206 for ; Wed, 27 Apr 2016 17:32:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68DD121C113; Wed, 27 Apr 2016 17:32:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1189B21C113 for ; Wed, 27 Apr 2016 17:32:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 040E4340C5B for ; Wed, 27 Apr 2016 17:32:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B70715F for ; Wed, 27 Apr 2016 17:32:11 +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: <1461778320.34aaa33ab5930e40f746ac7c75d9c1fe5026839e.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20001_all_fix-minimal-build-cmake-mysql-5.7.patch 20007_all_cmake-debug-werror-5.7.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 34aaa33ab5930e40f746ac7c75d9c1fe5026839e X-VCS-Branch: master Date: Wed, 27 Apr 2016 17:32:11 +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: 4eebefd6-7eb7-42b8-a2cf-4f3fabd42111 X-Archives-Hash: fb17837b7dc358f5b4f768af8a0e2696 commit: 34aaa33ab5930e40f746ac7c75d9c1fe5026839e Author: Brian Evans gentoo org> AuthorDate: Wed Apr 27 17:32:00 2016 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Apr 27 17:32:00 2016 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=34aaa33a Respin 2 patches for MySQL 5.7 20001_all_fix-minimal-build-cmake-mysql-5.7.patch | 15 +++++++++++++++ 20007_all_cmake-debug-werror-5.7.patch | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.7.patch b/20001_all_fix-minimal-build-cmake-mysql-5.7.patch new file mode 100644 index 0000000..bf21da4 --- /dev/null +++ b/20001_all_fix-minimal-build-cmake-mysql-5.7.patch @@ -0,0 +1,15 @@ +diff -aurwN mysql.orig/CMakeLists.txt mysql/CMakeLists.txt +--- a/CMakeLists.txt 2014-07-18 11:48:39.000000000 -0400 ++++ b/CMakeLists.txt 2014-08-01 12:54:52.612732241 -0400 +@@ -626,10 +626,10 @@ + # 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) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal) diff --git a/20007_all_cmake-debug-werror-5.7.patch b/20007_all_cmake-debug-werror-5.7.patch new file mode 100644 index 0000000..4321399 --- /dev/null +++ b/20007_all_cmake-debug-werror-5.7.patch @@ -0,0 +1,16 @@ +diff -aurN a/cmake/maintainer.cmake b/cmake/maintainer.cmake +--- a/cmake/maintainer.cmake 2014-11-21 00:39:51.000000000 -0500 ++++ b/cmake/maintainer.cmake 2014-12-03 13:19:50.893380789 -0500 +@@ -30,12 +30,6 @@ + "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field") + ENDIF() + +-# Turn on Werror (warning => error) when using maintainer mode. +-IF(MYSQL_MAINTAINER_MODE) +- SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror") +- SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror") +-ENDIF() +- + # Set warning flags for GCC/Clang + IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")