Skip to contentSkip to conversation

package/cmake: disable on unsupported architectures

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

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Samuel Martin

author
#0 lore raw

PATCH v2 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

Signed-off-by Samuel Martin <[email protected]>
Cc Baruch Siach <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
changes v1->v2:
- use positive logic (ThomasP)
- add depends on statement to the comment (Baruch)

Signed-off-by Samuel Martin <[email protected]>
---
 package/cmake/Config.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/cmake/Config.in +14 -0
index 0b5bba9..9c0b75a 100644
@@ -10,6 +10,13 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	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
 	depends on BR2_USE_WCHAR # libarchive
 	depends on BR2_INSTALL_LIBSTDCPP
 	help

@@ -22,4 +29,11 @@ config BR2_PACKAGE_CMAKE_CTEST
 	  http://www.cmake.org/
 
 comment "ctest needs a toolchain w/ C++, wchar"
+	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
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
Signature · 1 line
2.1.0
author
#1 lore raw

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

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

Signed-off-by Samuel Martin <[email protected]>

---
changes v1->v2:
- rebase

Signed-off-by Samuel Martin <[email protected]>
---
 package/cmake/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
package/cmake/Config.in +3 -2
index 9c0b75a..3bdfb13 100644
@@ -19,6 +19,7 @@ config BR2_PACKAGE_CMAKE_CTEST
 		BR2_i386 || BR2_x86_64
 	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),

@@ -28,7 +29,7 @@ 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_arm || BR2_armeb || \
 		BR2_aarch64 || \
 		BR2_m68k || \

@@ -36,4 +37,4 @@ comment "ctest needs a toolchain w/ C++, wchar"
 		BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
 		BR2_sparc || \
 		BR2_i386 || BR2_x86_64
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS
Signature · 1 line
2.1.0
#2 lore raw

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

In reply to Samuel Martin

Dear Samuel Martin,

Quoted 19 lines · Samuel Martin
package/cmake/Config.in +7 -0
index 0b5bba9..9c0b75a 100644
@@ -10,6 +10,13 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
+	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
 	depends on BR2_USE_WCHAR # libarchive
 	depends on BR2_INSTALL_LIBSTDCPP
 	help

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

Quoted 10 lines
package/cmake/Config.in +7 -0
@@ -22,4 +29,11 @@ config BR2_PACKAGE_CMAKE_CTEST
 	  http://www.cmake.org/
 
 comment "ctest needs a toolchain w/ C++, wchar"
+	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

Lots of code duplication -> introduce a BR2_PACKAGE_CMAKE_ARCH_SUPPORTS hidden variable.

Thanks,

Thomas

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