Commit 8fa60496 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

cmake: bump to version 3.3.2 



xtensa patch is upstream so there's no need for it any longer.

Signed-off-by: default avatarGustavo Zacarias <gustavo.zacarias@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 9878cec4

package/cmake/0002-KWIML-Teach-ABI.h-about-Xtensa-architecture.patch

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
From ded79a976e2b63bbfd7a63f27ec00bd071410e27 Mon Sep 17 00:00:00 2001

From: Max Filippov <jcmvbkbc@gmail.com>

Date: Tue, 17 Mar 2015 15:51:04 +0300

Subject: [PATCH] KWIML: Teach ABI.h about Xtensa architecture



Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

---

 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@_ABI_NO_VERIFY was defined.

 #  define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG

 # endif

 

+/* Xtensa */

+#elif defined(__XTENSA_EB__)

+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG

+#elif defined(__XTENSA_EL__)

+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE

+

 /* Unknown CPU */

 #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN)

 # error "Byte order of target CPU unknown."

-- 

1.8.1.4

package/cmake/Config.in

+5 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
# 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
Original line number Diff line number Diff line
@@ -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 \