cmake: Update from 3.6.2 to 3.7.1

This commit is contained in:
Fredrik Fornwall 2017-01-07 01:00:39 -05:00
parent bb290b16af
commit deeb04b560
2 changed files with 10 additions and 10 deletions

View File

@ -1,12 +1,12 @@
diff -u -r ../cmake-3.6.1/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx diff -u -r ../cmake-3.7.1/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx
--- ../cmake-3.6.1/Source/cmExecProgramCommand.cxx 2016-07-22 09:50:22.000000000 -0400 --- ../cmake-3.7.1/Source/cmExecProgramCommand.cxx 2016-11-30 10:14:32.000000000 -0500
+++ ./Source/cmExecProgramCommand.cxx 2016-08-14 06:53:11.667195266 -0400 +++ ./Source/cmExecProgramCommand.cxx 2017-01-06 06:22:11.611620662 -0500
@@ -209,7 +209,7 @@ @@ -200,7 +200,7 @@
} }
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
- const char* cmd[] = { "/bin/sh", "-c", command, 0 }; - const char* cmd[] = { "/bin/sh", "-c", command, CM_NULLPTR };
+ const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command, 0 }; + const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command, CM_NULLPTR };
cmsysProcess_SetCommand(cp, cmd); cmsysProcess_SetCommand(cp, cmd);
#endif #endif

View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=http://www.cmake.org/ TERMUX_PKG_HOMEPAGE=https://cmake.org/
TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
_MAJOR_VERSION=3.6 _MAJOR_VERSION=3.7
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 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_SRCURL=https://www.cmake.org/files/v${_MAJOR_VERSION}/cmake-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, ncurses, jsoncpp" TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, ncurses, jsoncpp"
termux_step_configure () { termux_step_configure () {