Skip to contentSkip to conversation

package/cmake bump to version 3.9.6

PATCH New James Hilliard 2 participants 4 messages Oct 13, 2019 – Oct 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/3 package/cmake bump to version 3.9.6

This is the latest cmake that doesn't require a c++11 toolchain.

---
 package/cmake/cmake.hash | 6 +++---
 package/cmake/cmake.mk   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
package/cmake/cmake.hash +3 -3
index 9e0159a3c8..340c81b9c9 100644
@@ -1,5 +1,5 @@
-# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
-sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d  cmake-3.8.2.tar.gz
+# From https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt
+sha256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218  cmake-3.9.6.tar.gz
 
 # Locally calculated
-sha256 af3030e1bf1af2f534430fdfe3cfc5a617966648a2a7f0c06a631adc92be1e5f  Copyright.txt
+sha256 9d8604f7afc5564ceb9705ba121f5fba2782ce18d92902f3c6ed338228372170  Copyright.txt
package/cmake/cmake.mk +2 -2
index a00691a128..e816963089 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.8
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.9
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3-Clause
 CMAKE_LICENSE_FILES = Copyright.txt
Signature · 1 line
2.20.1
#1 lore raw

PATCH v5 2/3 package/cmake: add version 3.15.3 and move 3.9.6 to cmake-compat

Retain cmake 3.9.6 for compatibility with toolchains without c++11 support.

Autodetect and build using latest compatible host-cmake.

Remove FindLibUV patch which is now upstream.

Resync/reformat rename cmake rootfile patch for 3.15.3 with git format-patch.

---
Changes v4 -> v5:
- create separate cmake packages

Changes v3 -> v4:
- retain support for version 3.8.2 for older toolchains

Changes v2 -> v3:
- split minimum cmake off from cmake version bump

Changes v1 -> v2:
- Set cmake version min to 3.10.

---
 package/Config.in.host                        |  1 +
 .../0001-rename_cmake_rootfile.patch          |  0
 ...k-uv-version-h-for-version-detection.patch |  0
 package/cmake-compat/Config.in.host           | 15 +++++
 package/cmake-compat/cmake-compat.hash        |  5 ++
 package/cmake-compat/cmake-compat.mk          | 62 +++++++++++++++++++
 .../cmake/0001-rename-cmake-rootfile.patch    | 43 +++++++++++++
 package/cmake/Config.in.host                  |  1 +
 package/cmake/cmake.hash                      |  6 +-
 package/cmake/cmake.mk                        |  4 +-
 support/dependencies/check-host-cmake.mk      |  4 ++
 11 files changed, 136 insertions(+), 5 deletions(-)
 rename package/{cmake => cmake-compat}/0001-rename_cmake_rootfile.patch (100%)
 rename package/{cmake => cmake-compat}/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch (100%)
 create mode 100644 package/cmake-compat/Config.in.host
 create mode 100644 package/cmake-compat/cmake-compat.hash
 create mode 100644 package/cmake-compat/cmake-compat.mk
 create mode 100644 package/cmake/0001-rename-cmake-rootfile.patch
package/Config.in.host +1 -0
index 93822304e9..0e0f028554 100644
@@ -8,6 +8,7 @@ menu "Host utilities"
 	source "package/checkpolicy/Config.in.host"
 	source "package/checksec/Config.in.host"
 	source "package/cmake/Config.in.host"
+	source "package/cmake-compat/Config.in.host"
 	source "package/cramfs/Config.in.host"
 	source "package/cryptsetup/Config.in.host"
 	source "package/dbus-python/Config.in.host"
package/cmake-compat/0001-rename_cmake_rootfile.patch renamed from package/cmake/0001-rename_cmake_rootfile.patch +0 -0
similarity index 100%
rename from package/cmake/0001-rename_cmake_rootfile.patch
rename to package/cmake-compat/0001-rename_cmake_rootfile.patch
package/cmake-compat/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch renamed from package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch +0 -0
similarity index 100%
rename from package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch
rename to package/cmake-compat/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch
package/cmake-compat/Config.in.host new file +15 -0
new file mode 100644
index 0000000000..c82dc5b306
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_HOST_CMAKE_COMPAT
+	bool "host cmake-compat"
+	depends on !BR2_HOST_GCC_AT_LEAST_4_8
+	help
+	  CMake is an open-source, cross-platform family of tools
+	  designed to build, test and package software. CMake is used
+	  to control the software compilation process using simple
+	  platform and compiler independent configuration files, and
+	  generate native makefiles and workspaces that can be used in
+	  the compiler environment of your choice.
+
+	  This provides compatibility with toolchains that don't
+	  support c++11.
+
+	  http://www.cmake.org/
package/cmake-compat/cmake-compat.hash new file +5 -0
new file mode 100644
index 0000000000..340c81b9c9
@@ -0,0 +1,5 @@
+# From https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt
+sha256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218  cmake-3.9.6.tar.gz
+
+# Locally calculated
+sha256 9d8604f7afc5564ceb9705ba121f5fba2782ce18d92902f3c6ed338228372170  Copyright.txt
package/cmake-compat/cmake-compat.mk new file +62 -0

62 lines not on this page · raw message

package/cmake/0001-rename-cmake-rootfile.patch new file +43 -0

43 lines not on this page · raw message

package/cmake/Config.in.host +1 -0
index b2e210ee2c..0a404493b0 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOST_CMAKE
 	bool "host cmake"
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
 	help
 	  CMake is an open-source, cross-platform family of tools
 	  designed to build, test and package software. CMake is used
package/cmake/cmake.hash +3 -3
index 340c81b9c9..0fdf12cc93 100644
@@ -1,5 +1,5 @@
-# From https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt
-sha256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218  cmake-3.9.6.tar.gz
+# From https://cmake.org/files/v3.15/cmake-3.15.3-SHA-256.txt
+sha256 13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5  cmake-3.15.3.tar.gz
 
 # Locally calculated
-sha256 9d8604f7afc5564ceb9705ba121f5fba2782ce18d92902f3c6ed338228372170  Copyright.txt
+sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9  Copyright.txt
package/cmake/cmake.mk +2 -2
index e816963089..2302d3f2cb 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.9
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6
+CMAKE_VERSION_MAJOR = 3.15
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3-Clause
 CMAKE_LICENSE_FILES = Copyright.txt
support/dependencies/check-host-cmake.mk +4 -0
index 5604713de6..4a1491d646 100644
@@ -10,5 +10,9 @@ BR2_CMAKE ?= $(call suitable-host-package,cmake,\
 	$(BR2_CMAKE_VERSION_MIN) $(BR2_CMAKE_CANDIDATES))
 ifeq ($(BR2_CMAKE),)
 BR2_CMAKE = $(HOST_DIR)/bin/cmake
+ifeq ($(BR2_HOST_GCC_AT_LEAST_4_8),)
+BR2_CMAKE_HOST_DEPENDENCY = host-cmake-compat
+else
 BR2_CMAKE_HOST_DEPENDENCY = host-cmake
 endif
+endif
Signature · 1 line
2.20.1
#2 lore raw

PATCH v5 3/3 support/dependencies: set cmake version min to 3.10 when required

In reply to James Hilliard

We retain 3.8 as the minimum for hosts without a c++ toolchain.

Add boolean selected by packages that require cmake >= 3.10

Select BR2_NEEDS_HOST_CMAKE_3_10 in wpewebkit and webkitgtk packages.

---
Changes v4 -> v5:
- explicitly set required cmake versions in wpewebkit/webkitgtk

Changes v3 -> v4:
- retain support for version 3.8.2 for older toolchains

---
 Config.in                                | 5 +++++
 package/webkitgtk/Config.in              | 3 ++-
 package/wpewebkit/Config.in              | 3 ++-
 support/dependencies/check-host-cmake.mk | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)
Config.in +5 -0
index a6e280b885..cc1cd410c5 100644
@@ -105,6 +105,11 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER
 config BR2_NEEDS_HOST_UTF8_LOCALE
 	bool
 
+# Hidden boolean selected by packages that need the host to have a
+# cmake >= 3.10.
+config BR2_NEEDS_HOST_CMAKE_3_10
+	bool
+
 source "arch/Config.in"
 
 menu "Build options"
package/webkitgtk/Config.in +2 -1
index db67c89042..46f9ecf8fe 100644
@@ -23,11 +23,12 @@ comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gc
 config BR2_PACKAGE_WEBKITGTK
 	bool "webkitgtk"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu, host-cmake
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_PACKAGE_LIBGTK3
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
+	select BR2_NEEDS_HOST_CMAKE_3_10
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_ENCHANT
package/wpewebkit/Config.in +2 -1
index 5f3e237c53..224c64446b 100644
@@ -32,12 +32,13 @@ config BR2_PACKAGE_WPEWEBKIT
 	depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
-	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu, host-cmake
 	depends on BR2_USE_WCHAR # icu, libsoup
 	depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy
 	depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy
 	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo
 	depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
+	select BR2_NEEDS_HOST_CMAKE_3_10
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_HARFBUZZ
support/dependencies/check-host-cmake.mk +4 -0
index 4a1491d646..ee8bc52509 100644
@@ -3,7 +3,11 @@
 # package is bumped or a new one added, and it requires a higher
 # version, our cmake infra will catch it and build its own.
 #
+ifeq ($(BR2_NEEDS_HOST_CMAKE_3_10),y)
+BR2_CMAKE_VERSION_MIN = 3.10
+else
 BR2_CMAKE_VERSION_MIN = 3.8
+endif
 
 BR2_CMAKE_CANDIDATES ?= cmake cmake3
 BR2_CMAKE ?= $(call suitable-host-package,cmake,\
Signature · 1 line
2.20.1
#3 lore raw

PATCH v5 1/3 package/cmake bump to version 3.9.6

In reply to James Hilliard
Quoted 2 lines · On Sun, 13 Oct 2019 11:31:49 -0600 James Hilliard <[email protected]>…

This is the latest cmake that doesn't require a c++11 toolchain.

You forgot to explain why the hash of the license file has changed. I added the appropriate explanation in the commit log, and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com