Skip to contentSkip to conversation

classpath: only allow on supported architectures

PATCH New Thomas Petazzoni 3 participants 5 messages Feb 27, 2017 – Feb 28, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 classpath: only allow on supported architectures

In commit a75ab1fc1dcc7eee8668b1c3c19b703f1390b2cd ("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 f12a146f817c8ef07a7d41a31a5336b5ef6a96e8, 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)

---
 package/classpath/0003-add-or1k-endian.patch | 18 ------------------
 package/classpath/Config.in                  |  8 ++++++++
 package/jamvm/Config.in                      |  2 ++
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 package/classpath/0003-add-or1k-endian.patch
package/classpath/0003-add-or1k-endian.patch deleted +0 -18
deleted file mode 100644
index 8bc8784..0000000
@@ -1,18 +0,0 @@
-Set endianess for or1k
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-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
package/classpath/Config.in +8 -0
index caab619..c49ff7a 100644
@@ -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
package/jamvm/Config.in +2 -0
index 2cc97a1..57e1a8e 100644
@@ -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
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 classpath: only allow on supported architectures

Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

In commit a75ab1fc1dcc7eee8668b1c3c19b703f1390b2cd ("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 f12a146f817c8ef07a7d41a31a5336b5ef6a96e8, since anyway or1k is not supported by JamVM.

Fixes:

Quoted 7 lines

http://autobuild.buildroot.net/results/55eb89f89e96b94a821778bc18ed844af08b7460/
(classpath on microblaze)

http://autobuild.buildroot.net/results/279dd731bd9ecf5f9d54bda3715caeaa7cbcdbb3/
(classpath on nios2)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 classpath: only allow on supported architectures

In reply to Thomas Petazzoni

Hello Thomas,

Quoted 64 lines · Thomas Petazzoni

In commit a75ab1fc1dcc7eee8668b1c3c19b703f1390b2cd ("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 f12a146f817c8ef07a7d41a31a5336b5ef6a96e8, 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)

---
 package/classpath/0003-add-or1k-endian.patch | 18 ------------------
 package/classpath/Config.in                  |  8 ++++++++
 package/jamvm/Config.in                      |  2 ++
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 package/classpath/0003-add-or1k-endian.patch
package/classpath/0003-add-or1k-endian.patch deleted +0 -18
deleted file mode 100644
index 8bc8784..0000000
@@ -1,18 +0,0 @@
-Set endianess for or1k
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-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
package/classpath/Config.in +0 -0
index caab619..c49ff7a 100644

package/classpath/Config.in line 6

Quoted 6 lines
package/classpath/Config.in +6 -0
@@ -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

I just tested with the test-pkg script and I also get successful sparc and sparc64 builds. Any particular reason to not enable it there?

I'll also test again if there is any change for the bumped 0.99 version.

Quoted 23 lines
package/classpath/Config.in +2 -0
+
 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
package/jamvm/Config.in +1 -0
index 2cc97a1..57e1a8e 100644
@@ -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

package/jamvm/Config.in config BR2_PACKAGE_JAMVM · line 20

Quoted 5 lines
package/jamvm/Config.in +1 -0
@@ -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

Best wishes,
Marcus

#3 lore raw

PATCH 1/1 classpath: only allow on supported architectures

Quoted 16 lines · Marcus Hoffmann

Hello Thomas,

package/classpath/Config.in line 6

Quoted 9 lines · Thomas Petazzoni
package/classpath/Config.in +6 -0
@@ -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

I just tested with the test-pkg script and I also get successful sparc and sparc64 builds. Any particular reason to not enable it there?

Quoted 1 line

I'll also test again if there is any change for the bumped 0.99 version.

No change there.

Marcus

#4 lore raw

PATCH 1/1 classpath: only allow on supported architectures

In reply to Marcus Hoffmann

Hello,

Quoted 7 lines · Marcus Hoffmann

package/classpath/Config.in line 6

Quoted 4 lines
package/classpath/Config.in +4 -0
+	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  

I just tested with the test-pkg script and I also get successful sparc and sparc64 builds. Any particular reason to not enable it there?

I indeed missed sparc/sparc64 when looking through native/fdlibm/ieeefp.h, so feel free to send a patch re-enabling classpath on those architectures.

However, in practice, jamvm doesn't support sparc/sparc64, so you'll be able to build classpath, but not jamvm, which is not a very useful result.

Best regards,

Thomas

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