Skip to contentSkip to conversation

package/openjdk: Add architecture support list

PATCH New aduskett at gmail.com 2 participants 2 messages Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/openjdk: Add architecture support list

From: Adam Duskett <[email protected]>

This list is taken from make/autoconf/platform.m4 and fixes
http://autobuild.buildroot.net/results/df7/df7f393ec62f0e38034837ffa591ac5af424c373
http://autobuild.buildroot.net/results/c57/c5782d6b52516d07469adf6600d4fc69c4016157
http://autobuild.buildroot.net/results/f36/f36b96c91604dda021ee05dd0a79c4f7e89e5a5b

---
 package/openjdk/Config.in | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
package/openjdk/Config.in +17 -0
index dd1f3c59cf..0e48ae2c76 100644
@@ -2,8 +2,22 @@ config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
 	bool
 	default y if BR2_HOSTARCH = "x86_64"
 
+# Taken from make/autoconf/platform.m4
+config BR2_PACKAGE_OPENJDK_BIN_ARCH_SUPPORTS
+	bool
+	default y if BR2_aarch64
+	default y if BR2_arm
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_m68k
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
+	default y if BR2_sh
+	default y if BR2_sparc || BR2_sparc64
+
 config BR2_PACKAGE_OPENJDK
 	bool "openjdk"
+	depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_OPENJDK_BIN_ARCH_SUPPORTS
 	depends on !BR2_SOFT_FLOAT
 	depends on !BR2_STATIC_LIBS # glibc
 	depends on BR2_INSTALL_LIBSTDCPP # cups
@@ -59,14 +73,17 @@ config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO
 endif
 
 comment "openjdk needs X.Org"
+	depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_XORG7
 
 comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++"
 	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
 
 comment "openjdk does not support soft float configurations"
+	depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS
 	depends on BR2_USE_MMU
 	depends on BR2_SOFT_FLOAT
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/openjdk: Add architecture support list

Hello Adam,

package/openjdk/Config.in config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS · line 6

Quoted 2 lines · On Mon, 25 Mar 2019 11:37:33 -0400 aduskett at gmail.com wrote:
package/openjdk/Config.in +2 -0
+# Taken from make/autoconf/platform.m4
+config BR2_PACKAGE_OPENJDK_BIN_ARCH_SUPPORTS

This should have been just:

BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS

Review

Quoted 2 lines

comment "openjdk needs X.Org"

(quoted diff) +1 -0
+	depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS

Valgrind ?

Should have been:

+ depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS

Review

Quoted 3 lines

comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++"

(quoted diff) +1 -0
 	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS

Ditto.

Review

Quoted 2 lines

comment "openjdk does not support soft float configurations"

(quoted diff) +1 -0
+	depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS

Ditto.

I fixed those issues and applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com