From 2d90d67571515fe8b87920b9d9fb57d1312ba3bd Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 17 Dec 2017 00:26:35 +0100
Subject: [PATCH] cmake: Update from 3.9.6 to 3.10.1

---
 build-package.sh                                     |  8 ++++----
 packages/cmake/Source-cmExecProgramCommand.cxx.patch | 12 ++++++------
 packages/cmake/build.sh                              |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index 186facbf4..d0552b9bf 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -87,7 +87,7 @@ termux_setup_golang() {
 	rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
 	termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
 	                "$TERMUX_BUILDGO_TAR" \
-	                de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
+	                f0f84761a254324ed9076c23fca502eb135ec49c0b752212a6298f317d303438
 
 	( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 }
@@ -163,8 +163,8 @@ termux_setup_meson() {
 
 # Utility function to setup a current cmake build system
 termux_setup_cmake() {
-	local TERMUX_CMAKE_MAJORVESION=3.9
-	local TERMUX_CMAKE_MINORVERSION=6
+	local TERMUX_CMAKE_MAJORVESION=3.10
+	local TERMUX_CMAKE_MINORVERSION=1
 	local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
 	local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
 	local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -172,7 +172,7 @@ termux_setup_cmake() {
 	if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
 		termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
 		                "$TERMUX_CMAKE_TARFILE" \
-		                062bf45bee36ce7c2a55ae26b8b5324720f370d420a05cba91b9448c64ffdbea
+		                f0f84761a254324ed9076c23fca502eb135ec49c0b752212a6298f317d303438
 		rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
 		tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
 		mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
diff --git a/packages/cmake/Source-cmExecProgramCommand.cxx.patch b/packages/cmake/Source-cmExecProgramCommand.cxx.patch
index abe6c1287..d60a7b7af 100644
--- a/packages/cmake/Source-cmExecProgramCommand.cxx.patch
+++ b/packages/cmake/Source-cmExecProgramCommand.cxx.patch
@@ -1,12 +1,12 @@
-diff -u -r ../cmake-3.7.1/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx
---- ../cmake-3.7.1/Source/cmExecProgramCommand.cxx	2016-11-30 10:14:32.000000000 -0500
-+++ ./Source/cmExecProgramCommand.cxx	2017-01-06 06:22:11.611620662 -0500
-@@ -200,7 +200,7 @@
+diff -u -r ../cmake-3.10.1/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx
+--- ../cmake-3.10.1/Source/cmExecProgramCommand.cxx	2017-12-13 14:25:23.000000000 +0100
++++ ./Source/cmExecProgramCommand.cxx	2017-12-15 12:18:37.696103242 +0100
+@@ -205,7 +205,7 @@
    }
    fflush(stdout);
    fflush(stderr);
--  const char* cmd[] = { "/bin/sh", "-c", command, CM_NULLPTR };
-+  const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command, CM_NULLPTR };
+-  const char* cmd[] = { "/bin/sh", "-c", command, nullptr };
++  const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command, nullptr };
    cmsysProcess_SetCommand(cp, cmd);
  #endif
  
diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index 776d175e0..0b40ebc30 100644
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://cmake.org/
 TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
-TERMUX_PKG_VERSION=3.9.6
-TERMUX_PKG_SHA256=7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218
-TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:3}/cmake-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION=3.10.1
+TERMUX_PKG_SHA256=7be36ee24b0f5928251b644d29f5ff268330a916944ef4a75e23ba01e7573284
+TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, librhash, make, clang"
 TERMUX_PKG_FORCE_CMAKE=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON"