Skip to content

Commit 39b5a72

Browse files
tpetazzonijacmet
authored andcommitted
classpath: only allow on supported architectures
In commit a75ab1f ("package/classpath: Don't depend on jamvm"), we removed the dependency of classpath on jamvm. Since jamvm is only available for a reduced set of architectures, classpath could until this commit until be built on those architectures. However, now that this dependency has been removed, classpath can potentially be built for all architectures supported by Buildroot, even though it doesn't support all of them. Since adding support for additional architectures in classpath doesn't make much sense, because classpath is in Buildroot only usable with JamVM anyway, and JamVM is only available for a small set of architectures, this commit simply makes classpath available on the architectures that it supports. By doing so, it also removes the or1k support patch which was added by commit f12a146, since anyway or1k is not supported by JamVM. Fixes: http://autobuild.buildroot.net/results/55eb89f89e96b94a821778bc18ed844af08b7460/ (classpath on microblaze) http://autobuild.buildroot.net/results/279dd731bd9ecf5f9d54bda3715caeaa7cbcdbb3/ (classpath on nios2) Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Peter Korsgaard <[email protected]>
1 parent 8461735 commit 39b5a72

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

package/classpath/0003-add-or1k-endian.patch

Lines changed: 0 additions & 18 deletions
This file was deleted.

package/classpath/Config.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
2+
bool
3+
default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
4+
|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
5+
|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
6+
|| BR2_sh || BR2_x86_64
7+
18
config BR2_PACKAGE_CLASSPATH
29
bool "classpath"
310
select BR2_NEEDS_HOST_JAR
411
select BR2_NEEDS_HOST_JAVAC
12+
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
513
help
614
GNU Classpath, Essential Libraries for Java, is a GNU
715
project to create free core class libraries for use with

package/jamvm/Config.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
44
depends on !BR2_STATIC_LIBS
55
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
66
|| BR2_mips || BR2_mipsel || BR2_powerpc
7+
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
78
select BR2_PACKAGE_ZLIB
89
select BR2_PACKAGE_CLASSPATH
910
help
@@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
1516
comment "jamvm needs a toolchain w/ threads, dynamic library"
1617
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
1718
|| BR2_mips || BR2_mipsel || BR2_powerpc
19+
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
1820
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

0 commit comments

Comments
 (0)