[Buildroot] [PATCH v3 1/2] package/cmake: disable on unsupported architectures

[Buildroot] [PATCH v3 1/2] package/cmake: disable on unsupported architectures

[Samuel Martin]

Supported architectures are listed at [1].

Fixes:
  http://autobuild.buildroot.net/results/de9/de9021fdc63600536ffa91e4b8718584e3e5702c/
  http://autobuild.buildroot.net/results/0f1/0f1afc62e91ab798fa65685af3dea3caac663f11/

[1] https://github.com/Kitware/CMake/blob/master/Utilities/KWIML/ABI.h.in#L339

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---
changes v2->v3
- introduce BR2_PACKAGE_CMAKE_ARCH_SUPPORTS (ThomasP)

changes v1->v2:
- use positive logic (ThomasP)
- add depends on statement to the comment (Baruch)
---
 package/cmake/Config.in | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package/cmake/Config.in b/package/cmake/Config.in
index 0b5bba9..36c5413 100644
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@@ -1,3 +1,14 @@
+config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
+	bool
+	default y
+	depends on BR2_arm || BR2_armeb || \
+		BR2_aarch64 || \
+		BR2_m68k || \
+		BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \
+		BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
+		BR2_sparc || \
+		BR2_i386 || BR2_x86_64
+
 config BR2_PACKAGE_CMAKE
 	bool
 
@@ -10,6 +21,7 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
 	depends on BR2_USE_WCHAR # libarchive
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
@@ -22,4 +34,5 @@ config BR2_PACKAGE_CMAKE_CTEST
 	  http://www.cmake.org/
 
 comment "ctest needs a toolchain w/ C++, wchar"
+	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
-- 
2.1.0

[Buildroot] [PATCH v3 2/2] package/cmake: not available on static-only build

[Samuel Martin]

Fixes:
  http://autobuild.buildroot.net/results/9f7/9f7c8d5078cd1f3cd493f9ae8e95c8ee728f98fd/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---
changes v2->v3:
- rebase

changes v1->v2:
- rebase
---
 package/cmake/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/cmake/Config.in b/package/cmake/Config.in
index 36c5413..3f0fd9b 100644
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@@ -24,6 +24,7 @@ config BR2_PACKAGE_CMAKE_CTEST
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
 	depends on BR2_USE_WCHAR # libarchive
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
 	help
 	  CTest is a testing tool distributed as a part of CMake. It
 	  can be used to automate updating (using CVS for example),
@@ -33,6 +34,6 @@ config BR2_PACKAGE_CMAKE_CTEST
 
 	  http://www.cmake.org/
 
-comment "ctest needs a toolchain w/ C++, wchar"
+comment "ctest needs a toolchain w/ C++, wchar, dynamic library"
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS
-- 
2.1.0

[Buildroot] [PATCH v3 2/2] package/cmake: not available on static-only build

[Thomas Petazzoni]

Dear Samuel Martin,

On Tue, 17 Mar 2015 11:20:24 +0100, Samuel Martin wrote:
> Fixes:
>   http://autobuild.buildroot.net/results/9f7/9f7c8d5078cd1f3cd493f9ae8e95c8ee728f98fd/
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v3 1/2] package/cmake: disable on unsupported architectures

[Thomas Petazzoni]

Dear Samuel Martin,

On Tue, 17 Mar 2015 11:20:23 +0100, Samuel Martin wrote:

> diff --git a/package/cmake/Config.in b/package/cmake/Config.in
> index 0b5bba9..36c5413 100644
> --- a/package/cmake/Config.in
> +++ b/package/cmake/Config.in
> @@ -1,3 +1,14 @@
> +config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
> +	bool
> +	default y
> +	depends on BR2_arm || BR2_armeb || \
> +		BR2_aarch64 || \
> +		BR2_m68k || \
> +		BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \
> +		BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
> +		BR2_sparc || \
> +		BR2_i386 || BR2_x86_64

I've rewrapped this a little bit so it looks nicer, and applied.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com