diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-07-06 16:46:33 +0300 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:44:04 +0100 |
| commit | bc6c4fcd2d67935f9eb2ef1e2e8c05078ec9a6d9 (patch) | |
| tree | 4ed06550d0ad6838ae80621bafa53f577c062dd2 | |
| parent | 24bf0c63dcde1a387b942e8733cf2371bff6d7dc (diff) | |
| download | upstream-bc6c4fcd2d67935f9eb2ef1e2e8c05078ec9a6d9.tar.gz upstream-bc6c4fcd2d67935f9eb2ef1e2e8c05078ec9a6d9.tar.bz2 upstream-bc6c4fcd2d67935f9eb2ef1e2e8c05078ec9a6d9.zip | |
tools/cmake: update to 3.11.4
Update cmake and refresh patches.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(backported from 55fa8068c4eb1f6213ca115655067e635da3e637)
| -rw-r--r-- | tools/cmake/Makefile | 4 | ||||
| -rw-r--r-- | tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index b6d628715c..3278a48188 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.11.1 +PKG_VERSION:=3.11.4 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cmake.org/files/v3.11/ \ https://fossies.org/linux/misc/ -PKG_HASH:=57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c +PKG_HASH:=8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5 HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index de5137ee38..1fb0ebeaac 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -1,6 +1,6 @@ --- a/bootstrap +++ b/bootstrap -@@ -1149,7 +1149,10 @@ int main(){ printf("1%c", (char)0x0a); r +@@ -1151,7 +1151,10 @@ int main(){ printf("1%c", (char)0x0a); r ' > "test.c" cmake_original_make_flags="${cmake_make_flags}" if [ "x${cmake_parallel_make}" != "x" ]; then |