From 78d7dd0d1b912d7b2456c293137d8192f5a04c29 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 14 Aug 2016 07:20:51 -0400 Subject: [PATCH] cmake: Update from 3.5.2 to 3.6.1 --- packages/cmake/Source-cmExecProgramCommand.cxx.patch | 14 +++++++------- packages/cmake/build.sh | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/cmake/Source-cmExecProgramCommand.cxx.patch b/packages/cmake/Source-cmExecProgramCommand.cxx.patch index deee12f5..75f82852 100644 --- a/packages/cmake/Source-cmExecProgramCommand.cxx.patch +++ b/packages/cmake/Source-cmExecProgramCommand.cxx.patch @@ -1,12 +1,12 @@ -diff -u -r ../cmake-3.2.2/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx ---- ../cmake-3.2.2/Source/cmExecProgramCommand.cxx 2015-04-13 13:09:00.000000000 -0400 -+++ ./Source/cmExecProgramCommand.cxx 2015-05-24 16:03:19.876643538 -0400 -@@ -256,7 +256,7 @@ - } +diff -u -r ../cmake-3.6.1/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx +--- ../cmake-3.6.1/Source/cmExecProgramCommand.cxx 2016-07-22 09:50:22.000000000 -0400 ++++ ./Source/cmExecProgramCommand.cxx 2016-08-14 06:53:11.667195266 -0400 +@@ -209,7 +209,7 @@ + } fflush(stdout); fflush(stderr); -- const char* cmd[] = {"/bin/sh", "-c", command, 0}; -+ const char* cmd[] = {"@TERMUX_PREFIX@/bin/sh", "-c", command, 0}; +- const char* cmd[] = { "/bin/sh", "-c", command, 0 }; ++ const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command, 0 }; cmsysProcess_SetCommand(cp, cmd); #endif diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index ce5fc2c2..bb1a4c89 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.cmake.org/ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" -_MAJOR_VERSION=3.5 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 -TERMUX_PKG_BUILD_REVISION=1 +_MAJOR_VERSION=3.6 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 TERMUX_PKG_SRCURL=http://www.cmake.org/files/v${_MAJOR_VERSION}/cmake-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, ncurses, jsoncpp" -- 2.11.0