sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Update from 3.14.5 to 3.15.2

Browse Source
This commit is contained in:
Fredrik Fornwall 2019-08-21 13:04:25 +02:00
parent 73c9a3b2b6
commit 5eaa982ba2
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/cmake/Source-CMakeLists.txt.patch Normal file
View File

@ -0,0 +1,12 @@
diff -u -r ../cmake-3.15.2/Source/CMakeLists.txt ./Source/CMakeLists.txt
--- ../cmake-3.15.2/Source/CMakeLists.txt 2019-08-07 16:58:29.000000000 +0000
+++ ./Source/CMakeLists.txt 2019-08-21 10:42:07.237355685 +0000
@@ -759,7 +759,7 @@
# GHS support
# Works only for windows and linux
-if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
set(SRCS ${SRCS}
cmGlobalGhsMultiGenerator.cxx
cmGlobalGhsMultiGenerator.h

10
packages/cmake/Source-cmExecProgramCommand.cxx.patch
View File

@ -1,12 +1,12 @@
diff -u -r ../cmake-3.10.1/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx diff -u -r ../cmake-3.15.2/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx
--- ../cmake-3.10.1/Source/cmExecProgramCommand.cxx 2017-12-13 14:25:23.000000000 +0100 --- ../cmake-3.15.2/Source/cmExecProgramCommand.cxx 2019-08-07 16:58:29.000000000 +0000
+++ ./Source/cmExecProgramCommand.cxx 2017-12-15 12:18:37.696103242 +0100 +++ ./Source/cmExecProgramCommand.cxx 2019-08-18 20:05:17.156753010 +0000
@@ -205,7 +205,7 @@ @@ -205,7 +205,7 @@
} }
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
- const char* cmd[] = { "/bin/sh", "-c", command, nullptr }; - const char* cmd[] = { "/bin/sh", "-c", command.c_str(), nullptr };
+ const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command, nullptr }; + const char* cmd[] = { "@TERMUX_PREFIX/bin/sh", "-c", command.c_str(), nullptr };
cmsysProcess_SetCommand(cp, cmd); cmsysProcess_SetCommand(cp, cmd);
#endif #endif

5
packages/cmake/build.sh
View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://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"
TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_VERSION=3.14.5 TERMUX_PKG_VERSION=3.15.2
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06 TERMUX_PKG_SHA256=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib" TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_FORCE_CMAKE=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON"

6
scripts/build/setup/termux_setup_cmake.sh
View File

@ -1,6 +1,6 @@
termux_setup_cmake() { termux_setup_cmake() {
local TERMUX_CMAKE_MAJORVESION=3.14 local TERMUX_CMAKE_MAJORVESION=3.15
local TERMUX_CMAKE_MINORVERSION=5 local TERMUX_CMAKE_MINORVERSION=2
local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION 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_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@ -10,7 +10,7 @@ termux_setup_cmake() {
if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
"$TERMUX_CMAKE_TARFILE" \ "$TERMUX_CMAKE_TARFILE" \
757e7ddd29d11422334a60d7cd9c19b7af20349a03cb15aa3c879f1b54193c95 f8cbec2abc433938bd9378b129d1d288bb33b8b5a277afe19644683af6e32a59
rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \