You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2017/07/20 18:18:55 UTC
kudu git commit: KUDU-2072: upgrade to cmake 3.9.0 breaks sles12sp0
cmake patch
Repository: kudu
Updated Branches:
refs/heads/master bd61f2d57 -> 27854fd49
KUDU-2072: upgrade to cmake 3.9.0 breaks sles12sp0 cmake patch
Updates the patch and adds a note in vars.sh to hint that
CMake version changes may require updating the patch.
Testing: Locally tested by forcing the patch to always be
applied.
Change-Id: I689d57c736ef6845d44b246b0be1cf83aa7e59e4
Reviewed-on: http://gerrit.cloudera.org:8080/7473
Reviewed-by: Todd Lipcon <to...@apache.org>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/27854fd4
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/27854fd4
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/27854fd4
Branch: refs/heads/master
Commit: 27854fd4950466c09adebd9b3cf56c7d93bde0b5
Parents: bd61f2d
Author: Matthew Jacobs <mj...@cloudera.com>
Authored: Thu Jul 20 09:33:03 2017 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Thu Jul 20 17:16:26 2017 +0000
----------------------------------------------------------------------
.../cmake-issue-15873-dont-use-select.patch | 21 ++++++++++++++++----
thirdparty/vars.sh | 2 ++
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/27854fd4/thirdparty/patches/cmake-issue-15873-dont-use-select.patch
----------------------------------------------------------------------
diff --git a/thirdparty/patches/cmake-issue-15873-dont-use-select.patch b/thirdparty/patches/cmake-issue-15873-dont-use-select.patch
index c5d4c7f..1a8e975 100644
--- a/thirdparty/patches/cmake-issue-15873-dont-use-select.patch
+++ b/thirdparty/patches/cmake-issue-15873-dont-use-select.patch
@@ -1,14 +1,27 @@
+From cfdd1aebc180805d7148c2c385c2e0b97287bedc Mon Sep 17 00:00:00 2001
+From: Matthew Jacobs <mj...@cloudera.com>
+Date: Thu, 20 Jul 2017 09:28:41 -0700
+Subject: [PATCH] Don't use select() due to
+ https://cmake.org/Bug/view.php?id=15873
+
+---
+ Source/kwsys/ProcessUNIX.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
-index 1be6d02..525217a 100644
+index 9ebcfce..b448b03 100644
--- a/Source/kwsys/ProcessUNIX.c
+++ b/Source/kwsys/ProcessUNIX.c
-@@ -110,7 +110,8 @@ static inline void kwsysProcess_usleep(unsigned int msec)
+@@ -100,7 +100,8 @@ static inline void kwsysProcess_usleep(unsigned int msec)
* without select().
*/
#if !defined(__BEOS__) && !defined(__VMS) && !defined(__MINT__)
--# define KWSYSPE_USE_SELECT 1
+-#define KWSYSPE_USE_SELECT 1
+// Don't use select() due to https://cmake.org/Bug/view.php?id=15873
-+# define KWSYSPE_USE_SELECT 0
++#define KWSYSPE_USE_SELECT 0
#endif
/* Some platforms do not have siginfo on their signal handlers. */
+--
+1.9.1
+
http://git-wip-us.apache.org/repos/asf/kudu/blob/27854fd4/thirdparty/vars.sh
----------------------------------------------------------------------
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 6807550..35d5891 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -54,6 +54,8 @@ PROTOBUF_VERSION=3.3.0
PROTOBUF_NAME=protobuf-$PROTOBUF_VERSION
PROTOBUF_SOURCE=$TP_SOURCE_DIR/$PROTOBUF_NAME
+# Note: CMake gets patched on SLES12SP0. When changing the CMake version, please check if
+# cmake-issue-15873-dont-use-select.patch needs to be updated.
CMAKE_VERSION=3.9.0
CMAKE_NAME=cmake-$CMAKE_VERSION
CMAKE_SOURCE=$TP_SOURCE_DIR/$CMAKE_NAME