deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

classpath: only allow on supported architectures

Browse source 
In commit a75ab1fc1d ("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 f12a146f81, 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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2017-02-27 23:16:11 +01:00 committed by Peter Korsgaard
parent 84617352f3
commit 39b5a72ee5
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package/classpath/0003-add-or1k-endian.patch
View file

@ -1,18 +0,0 @@
Set endianess for or1k
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff -Nur classpath-0.98.orig/native/fdlibm/ieeefp.h classpath-0.98/native/fdlibm/ieeefp.h
--- classpath-0.98.orig/native/fdlibm/ieeefp.h 2008-01-13 18:33:50.000000000 +0100
+++ classpath-0.98/native/fdlibm/ieeefp.h 2017-02-26 12:39:12.316327363 +0100
@@ -123,6 +123,10 @@
#define __IEEE_BIG_ENDIAN
#endif
+#ifdef __or1k__
+#define __IEEE_BIG_ENDIAN
+#endif
+
#ifdef __v800
#define __IEEE_LITTLE_ENDIAN
#endif

8
package/classpath/Config.in
View file

@ -1,7 +1,15 @@
config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
bool
default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
|| BR2_sh || BR2_x86_64
config BR2_PACKAGE_CLASSPATH
bool "classpath"
select BR2_NEEDS_HOST_JAR
select BR2_NEEDS_HOST_JAVAC
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
help
GNU Classpath, Essential Libraries for Java, is a GNU
project to create free core class libraries for use with

2
package/jamvm/Config.in
View file

@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
depends on !BR2_STATIC_LIBS
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|| BR2_mips || BR2_mipsel || BR2_powerpc
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_CLASSPATH
help
@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
comment "jamvm needs a toolchain w/ threads, dynamic library"
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|| BR2_mips || BR2_mipsel || BR2_powerpc
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS