cmake: bump to version 3.3.2
PATCH 1/2 cmake: bump to version 3.3.2
From: Gustavo Zacarias <[email protected]>
xtensa patch is upstream so there's no need for it any longer.
--- ...IML-Teach-ABI.h-about-Xtensa-architecture.patch | 30 ---------------------- package/cmake/Config.in | 7 +++-- package/cmake/cmake.hash | 4 +-- package/cmake/cmake.mk | 6 ++--- 4 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From ded79a976e2b63bbfd7a63f27ec00bd071410e27 Mon Sep 17 00:00:00 2001 -From: Max Filippov <[email protected]> -Date: Tue, 17 Mar 2015 15:51:04 +0300 -Subject: [PATCH] KWIML: Teach ABI.h about Xtensa architecture - -Signed-off-by: Max Filippov <[email protected]> ---- - Utilities/KWIML/ABI.h.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in -index 21c9139..6300ada 100644 ---- a/Utilities/KWIML/ABI.h.in -+++ b/Utilities/KWIML/ABI.h.in -@@ -432,6 +432,12 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined. - # define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG - # endif - -+/* Xtensa */ -+#elif defined(__XTENSA_EB__) -+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_BIG -+#elif defined(__XTENSA_EL__) -+# define @KWIML at _ABI_ENDIAN_ID @KWIML at _ABI_ENDIAN_ID_LITTLE -+ - /* Unknown CPU */ - #elif !defined(@KWIML at _ABI_NO_ERROR_ENDIAN) - # error "Byte order of target CPU unknown." --- -1.8.1.4 -
package/cmake/Config.in +5 -2
@@ -14,12 +14,14 @@ config BR2_PACKAGE_CMAKE_CTEST bool "ctest" select BR2_PACKAGE_CMAKE select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBARCHIVE select BR2_PACKAGE_EXPAT select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_XZ depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS
@@ -32,6 +34,7 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
package/cmake/cmake.hash +2 -2
@@ -1,2 +1,2 @@ -# Locally calculated -sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 cmake-3.1.3.tar.gz +# From http://www.cmake.org/files/v3.3/cmake-3.3.2-SHA-256.txt +sha256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 cmake-3.3.2.tar.gz
package/cmake/cmake.mk +3 -3
@@ -4,14 +4,14 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.1 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION_MAJOR = 3.3 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt HOST_CMAKE_DEPENDENCIES = host-pkgconf -CMAKE_DEPENDENCIES = zlib libcurl libarchive expat bzip2 xz +CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz CMAKE_CONF_OPTS = \ -DKWSYS_LFS_WORKS=TRUE \
Signature · 1 line
2.4.6
Thomas Petazzoni
AppliedPATCH 1/2 cmake: bump to version 3.3.2
Dear gustavo.zacarias at free-electrons.com,
Quoted 4 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
xtensa patch is upstream so there's no need for it any longer.
Quoted 8 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- ...IML-Teach-ABI.h-about-Xtensa-architecture.patch | 30 ---------------------- package/cmake/Config.in | 7 +++-- package/cmake/cmake.hash | 4 +-- package/cmake/cmake.mk | 6 ++--- 4 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 cmake: bump to version 3.3.2
In reply to gustavo.zacarias at free-electrons.comGustavo,
Quoted 5 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
xtensa patch is upstream so there's no need for it any longer.
Signed-off-by Gustavo Zacarias <[email protected]>
This is causing some build issues:
http://autobuild.buildroot.net/results/2bd81e2ecb09e64ccf9e5c35f1160a9b9e7bd079/
Can you have a look?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 cmake: bump to version 3.3.2
Quoted 8 lines · Thomas Petazzoni
Gustavo,
Quoted 4 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
xtensa patch is upstream so there's no need for it any longer.
Quoted 7 lines
Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>This is causing some build issues:
http://autobuild.buildroot.net/results/2bd81e2ecb09e64ccf9e5c35f1160a9b9e7bd079/Can you have a look?
Hi Thomas.
It's just that single failure in that single host, for a file that never changes.
I bet it's a SEU, the ASCII code for 'L' is 0100 1100, and for '\' it's 0101 1100.
According to https://gcc.gnu.org/wiki/CompileFarm gcc75 is an i7-2600, hence no ECC memory.
Regards.