Skip to contentSkip to conversation

package/cmake: disable on unsupported architectures

PATCH Superseded Samuel Martin 3 participants 4 messages Mar 17, 2015

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/cmake: disable on unsupported architectures

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

---
 package/cmake/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)
package/cmake/Config.in +6 -0
index 0b5bba9..eee2461 100644
@@ -10,6 +10,12 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	depends on !BR2_arcle && !BR2_arceb
+	depends on !BR2_bfin
+	depends on !BR2_microblazeel && !BR2_microblazebe
+	depends on !BR2_nios2
+	depends on !BR2_sh && !BR2_sh64
+	depends on !BR2_xtensa
 	depends on BR2_USE_WCHAR # libarchive
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/2 package/cmake: not available on static-only build

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

---
 package/cmake/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
package/cmake/Config.in +3 -2
index eee2461..3165572 100644
@@ -18,6 +18,7 @@ config BR2_PACKAGE_CMAKE_CTEST
 	depends on !BR2_xtensa
 	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),
@@ -27,5 +28,5 @@ config BR2_PACKAGE_CMAKE_CTEST
 
 	  http://www.cmake.org/
 
-comment "ctest needs a toolchain w/ C++, wchar"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "ctest needs a toolchain w/ C++, wchar, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS
Signature · 1 line
2.1.0
#2 lore raw

PATCH 1/2 package/cmake: disable on unsupported architectures

In reply to Samuel Martin

Dear Samuel Martin,

Quoted 5 lines · Samuel Martin
package/cmake/Config.in +0 -0
index 0b5bba9..eee2461 100644

package/cmake/Config.in config BR2_PACKAGE_CMAKE_CTEST · line 18

Quoted 9 lines
package/cmake/Config.in +6 -0
@@ -10,6 +10,12 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	depends on !BR2_arcle && !BR2_arceb
+	depends on !BR2_bfin
+	depends on !BR2_microblazeel && !BR2_microblazebe
+	depends on !BR2_nios2
+	depends on !BR2_sh && !BR2_sh64
+	depends on !BR2_xtensa

So maybe we should have a positive test instead?

	depends on BR2_arm || BR2_armeb || BR2_...

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 package/cmake: disable on unsupported architectures

In reply to Samuel Martin

Hi Samuel,

Quoted 18 lines · 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

---
 package/cmake/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)
package/cmake/Config.in +0 -0
index 0b5bba9..eee2461 100644

package/cmake/Config.in config BR2_PACKAGE_CMAKE_CTEST · line 18

Quoted 9 lines
package/cmake/Config.in +6 -0
@@ -10,6 +10,12 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	depends on !BR2_arcle && !BR2_arceb
+	depends on !BR2_bfin
+	depends on !BR2_microblazeel && !BR2_microblazebe
+	depends on !BR2_nios2
+	depends on !BR2_sh && !BR2_sh64
+	depends on !BR2_xtensa

Please update the dependencies comment below.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -