Skip to content

Commit

Permalink
tools/cmake: update to 3.19.1
Browse files Browse the repository at this point in the history 
Update cmake to version 3.19.1

Release notes: https://cmake.org/cmake/help/v3.19/release/3.19.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
  • Loading branch information
@hnyman @dedeckeh
hnyman authored and dedeckeh committed Dec 15, 2020
1 parent afd4bf0 commit bfc433e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions tools/cmake/Makefile
View file
Expand Up @@ -7,14 +7,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=cmake
PKG_VERSION:=3.18.5
PKG_VERSION:=3.19.1
PKG_RELEASE:=1
PKG_CPE_ID:=cpe:/a:kitware:cmake

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
https://cmake.org/files/v3.18/
PKG_HASH:=080bf24b0f73f4bf3ec368d2be1aa59369b9bb1cd693deeb6f18fe553ca74ab4
https://cmake.org/files/v3.19/
PKG_HASH:=1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba

HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
Expand Down
2 changes: 1 addition & 1 deletion tools/cmake/patches/120-curl-fix-libressl-linking.patch
View file
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -488,6 +488,14 @@ if(CMAKE_USE_OPENSSL)
@@ -508,6 +508,14 @@ if(CMAKE_USE_OPENSSL)
endif()
set(SSL_ENABLED ON)
set(USE_OPENSSL ON)
Expand Down
2 changes: 1 addition & 1 deletion tools/cmake/patches/130-bootstrap_parallel_make_flag.patch
View file
@@ -1,6 +1,6 @@
--- a/bootstrap
+++ b/bootstrap
@@ -1297,7 +1297,10 @@ int main(){ printf("1%c", (char)0x0a); r
@@ -1397,7 +1397,10 @@ int main(){ printf("1%c", (char)0x0a); r
' > "test.c"
cmake_original_make_flags="${cmake_make_flags}"
if test "x${cmake_parallel_make}" != "x"; then
Expand Down

3 comments on commit bfc433e

@neheb
Copy link
Contributor

@neheb neheb commented on bfc433e Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke ccache it seems.

@nxhack
Copy link
Contributor

@nxhack nxhack commented on bfc433e Dec 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like ccache can be enabled with such a change.

diff --git a/include/cmake.mk b/include/cmake.mk
index 0a20530..a7905ba 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -19,27 +19,20 @@ else
 endif
 
 ifeq ($(CONFIG_CCACHE),)
- CMAKE_C_COMPILER:=$(call cmake_tool,$(TARGET_CC))
- CMAKE_CXX_COMPILER:=$(call cmake_tool,$(TARGET_CXX))
- CMAKE_C_COMPILER_ARG1:=
- CMAKE_CXX_COMPILER_ARG1:=
-
- CMAKE_HOST_C_COMPILER:=$(HOSTCC)
- CMAKE_HOST_CXX_COMPILER:=$(HOSTCXX)
- CMAKE_HOST_C_COMPILER_ARG1:=
- CMAKE_HOST_CXX_COMPILER_ARG1:=
+ CMAKE_C_COMPILER_LAUNCHER:=
+ CMAKE_CXX_COMPILER_LAUNCHER:=
 else
-  CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
-  CMAKE_C_COMPILER:=$(CCACHE)
-  CMAKE_C_COMPILER_ARG1:=$(TARGET_CC_NOCACHE)
-  CMAKE_CXX_COMPILER:=$(CCACHE)
-  CMAKE_CXX_COMPILER_ARG1:=$(TARGET_CXX_NOCACHE)
-
-  CMAKE_HOST_C_COMPILER:=$(CCACHE)
-  CMAKE_HOST_C_COMPILER_ARG1:=$(HOSTCC_NOCACHE)
-  CMAKE_HOST_CXX_COMPILER:=$(CCACHE)
-  CMAKE_HOST_CXX_COMPILER_ARG1:=$(HOSTCXX_NOCACHE)
+ CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
+ CMAKE_C_COMPILER_LAUNCHER:=$(CCACHE)
+ CMAKE_CXX_COMPILER_LAUNCHER:=$(CCACHE)
 endif
+
+CMAKE_C_COMPILER:=$(call cmake_tool,$(TARGET_CC_NOCACHE))
+CMAKE_CXX_COMPILER:=$(call cmake_tool,$(TARGET_CXX_NOCACHE))
+
+CMAKE_HOST_C_COMPILER:=$(HOSTCC_NOCACHE)
+CMAKE_HOST_CXX_COMPILER:=$(HOSTCXX_NOCACHE)
+
 CMAKE_AR:=$(call cmake_tool,$(TARGET_AR))
 CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
 CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
@@ -61,12 +54,11 @@ define Build/Configure/Default
                        -DCMAKE_BUILD_TYPE=Release \
                        -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
                        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+                       -DCMAKE_C_COMPILER_LAUNCHER="$(CMAKE_C_COMPILER_LAUNCHER)" \
                        -DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
-                       -DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
+                       -DCMAKE_CXX_COMPILER_LAUNCHER="$(CMAKE_CXX_COMPILER_LAUNCHER)" \
                        -DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
-                       -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
                        -DCMAKE_ASM_COMPILER="$(CMAKE_C_COMPILER)" \
-                       -DCMAKE_ASM_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
                        -DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
                        -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS) $(CMAKE_SHARED_LDFLAGS)" \
                        -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS) $(CMAKE_SHARED_LDFLAGS)" \
@@ -107,12 +99,11 @@ define Host/Configure/Default
                LDFLAGS="$(HOST_LDFLAGS)" \
                cmake \
                        -DCMAKE_BUILD_TYPE=Release \
+                       -DCMAKE_C_COMPILER_LAUNCHER="$(CMAKE_C_COMPILER_LAUNCHER)" \
                        -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \
-                       -DCMAKE_C_COMPILER_ARG1="$(CMAKE_HOST_C_COMPILER_ARG1)" \
+                       -DCMAKE_CXX_COMPILER_LAUNCHER="$(CMAKE_CXX_COMPILER_LAUNCHER)" \
                        -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \
-                       -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_HOST_CXX_COMPILER_ARG1)" \
                        -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \
-                       -DCMAKE_ASM_COMPILER_ARG1="$(CMAKE_HOST_C_COMPILER_ARG1)" \
                        -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
                        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
                        -DCMAKE_EXE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \

@Eliminater74
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ccache is broke with this change..........

Please sign in to comment.