openjdk: new package
PATCH v7 1/3 openjdk: new package
From: Adam Duskett <[email protected]>
OpenJDK is a free and open-source implementation of the Java Platform. This package provides the option to build a client or a server JVM interpreter.
The default option is the server option, as that is what the majority of users use. This JVM interpreter loads more slowly, putting more effort into JIT compilations to yield higher performance.
Unlike most autotools packages, OpenJDK is exceptionally different and has many quirks, some of which are below:
- X11, alsa, and cups are required to build Java, even if it's a headless build.
See http://hg.openjdk.java.net/jdk10/jdk10/raw-file/tip/common/doc/building.html#external-library-requirements
for more information.
- host-zip is needed for the zip executable.
- There is no autogen.sh file, instead, a user must call "./configure autogen."
- OpenJDK ignores some variables unless passed via the environment. These variables are: PATH, LD, CC, CXX, and CPP.
- OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as arguments during the linking process, which causes linking failures. To fix this issue, ld is set to gcc.
- If ccache is enabled, Buildroot sets CC, CXX, and CPP to the ccache binary, which causes the configuration error:
"Please use --enable-ccache instead of providing a wrapped compiler." This error is why CC, CPP, and CXX are explicitly set to point to their actual binaries.
- Make -jn is unsupported. Instead, one must use the "--with-jobs=" configure option, and use $(MAKE1).
- Even when cross-compiling, OpenJDK builds several host-tools using the host's gcc. In the case of zlib, if a host doesn't have the zlib development package installed, OpenJDK compilation stops because zlib.h won't exist on the host system. Because zlib is used to compile both native tools and cross-compiled tools, patching make/autoconf/lib-bundled.m4 to call PKG_CHECK_MODULES for zlib results in the host gcc trying to use cross-compiled libraries for compiling native tools, which results in linking failures.
Using --with-zlib=bundled allows OpenJDK to compile correctly.
---
Changes v1 -> v2:
- Fixed the patch name.
Changes v2 -> v3:
- Changed the install location of the libraries and binaries to
$(TARGET_DIR)/bin and $(TARGET_DIR)/lib.
- Changed -with-boot-jdk location to $(HOST_DIR)/openjdk
- Added a more in-depth commit message explaining some of the my reasoning for some of the quirks in the package files.
Changes v3 -> v4:
- Changed GPLv2+ -> GPL-2.0+ (Thomas)
- Added BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS to Config.in
- Removed first person wordage. (Thomas)
Changes v4 -> v5:
- Add jpeg, giflib, libpng, and zlib as dependencies. (Thomas)
- Remove dependencies that aren't necessary. (Thomas)
- Add better comments in the openjdk.mk file. (Matthew)
- Change --with-boot-jdk location to just $(HOST_DIR)
- Use newer Oracle provided cpu port for aarch64.
- Update version to 11.0.2+9
Changes v5 -> v6:
- Added comment about zlib in the commit message.
- Added LCMS2 as a dependency.
- Added more comments in Config.in
- Added host-zip as a dependency in openjdk.mk.
- Drop zlib as a dependency (See above comment.)
- Changed --with-zlib=system to --with-zlib=bundled (See above comment.)
- Cleaned up grammar in openjdk.mk.
- Removed uneeded conf_opts in openjdk.mk.
- Reverted previous change of --with-cpu-port=aarch64 to --with-cpu-port=arm64. This change breaks compiling, with missing calls to NativePltCall.
Changes v6 -> v7:
- Removed AArch64 support in favor of a separate patch.
OpenJDK works on AArch64 without the option; it just isn't as fast. This change makes the patch set follow section 21.5.1 of the Buildroot manual:
"The patch itself should do only one change, but do it completely."
- Fix typos (Thomas)
- Clean up spacing in oppenjdk.mk (Thomas)
- Add more explanations to the commit message (Thomas)
- Clean up grammar in the openjdk.mk comments.
- Clean up grammar in the commit message.
- Reword many of the comments in the openjdk.mk file to better explain why the reasoning behind the logic.
- Remove --prefix from configure options. This option is used only if "make install" is called.
- Removed --with-extra-path=$(HOST_DIR)/bin:$(HOST_DIR)/sbin, as this is also not needed.
- Change cp -rf to cp -dpfr for the OPENJDK_INSTALL_TARGET_CMDS step.
DEVELOPERS | 1 + package/Config.in | 1 + package/openjdk/Config.in | 56 +++++++++++++++++ package/openjdk/openjdk.hash | 3 + package/openjdk/openjdk.mk | 114 +++++++++++++++++++++++++++++++++++ 5 files changed, 175 insertions(+) create mode 100644 package/openjdk/Config.in create mode 100644 package/openjdk/openjdk.hash create mode 100644 package/openjdk/openjdk.mk
DEVELOPERS +1 -0
@@ -50,6 +50,7 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/nginx-naxsi/ +F: package/openjdk/ F: package/openjdk-bin/ F: package/policycoreutils/ F: package/python-flask-sqlalchemy/
package/Config.in +1 -0
@@ -668,6 +668,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL menu "Perl libraries/modules"
package/openjdk/Config.in new file +56 -0
56 lines not on this page · raw message
package/openjdk/openjdk.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally computed +sha256 6c69a2c1b5177659d4263545cf83e0fbcd697669b0107481372be3648af7b89b openjdk-jdk-11.0.2+9.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE
package/openjdk/openjdk.mk new file +114 -0
114 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v7 2/3 package/openjdk: package/openjdk: Add AArch64 support
From: Adam Duskett <[email protected]>
OpenJDK has CPU ports for the AArch64 and ARM architectures. Add support for AArch64 as the first.
--- package/openjdk/openjdk.mk | 5 +++++ 1 file changed, 5 insertions(+)
package/openjdk/openjdk.mk +5 -0
@@ -86,6 +86,11 @@ OPENJDK_CONF_OPTS = \ --with-version-string="$(OPENJDK_VERSION_MAJOR)" \ --with-zlib=bundled +# If building for AArch64, use the provided CPU port. +ifeq ($(BR2_aarch64),y) +OPENJDK_CONF_OPTS += --with-cpu-port=aarch64 --with-abi-profile=aarch64 +endif + ifeq ($(BR2_CCACHE),y) OPENJDK_CONF_OPTS += \ --enable-ccache \
Signature · 1 line
2.20.1
PATCH v7 3/3 openjdk-hello-world: new test
In reply to aduskett at gmail.comFrom: Daniel J. Leach <[email protected]>
This test is a simple "Hello, World" integration test of the OpenJDK package.
It compiles the Java app on the host, then runs it on an emulated AARCH64 target and verifies "Hello, World" is printed.
---
Changes v1 -> v3:
- Added this patch to the series.
Changes v3 -> v5:
- None
Changes v5 -> v6:
- Updated .gitlab-ci.yml entry.
- Fixed From: and SOB line.
Changes v6 -> v7:
- None
.gitlab-ci.yml | 1 + DEVELOPERS | 1 + .../package/br2-external/openjdk/Config.in | 1 + .../br2-external/openjdk/external.desc | 1 + .../package/br2-external/openjdk/external.mk | 1 + .../package/openjdk-hello-world/Config.in | 26 ++++++++++++ .../openjdk-hello-world/HelloWorld.java | 7 ++++ .../openjdk-hello-world.mk | 18 ++++++++ support/testing/tests/package/test_openjdk.py | 42 +++++++++++++++++++ 9 files changed, 98 insertions(+) create mode 100644 support/testing/tests/package/br2-external/openjdk/Config.in create mode 100644 support/testing/tests/package/br2-external/openjdk/external.desc create mode 100644 support/testing/tests/package/br2-external/openjdk/external.mk create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk create mode 100644 support/testing/tests/package/test_openjdk.py
.gitlab-ci.yml +1 -0
@@ -328,6 +328,7 @@ tests.package.test_ipython.TestIPythonPy2: { extends: .runtime_test } tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test } tests.package.test_lua.TestLua: { extends: .runtime_test } tests.package.test_lua.TestLuajit: { extends: .runtime_test } +tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test } tests.package.test_perl.TestPerl: { extends: .runtime_test } tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test } tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test }
DEVELOPERS +1 -0
@@ -1478,6 +1478,7 @@ F: package/valijson/ F: package/wpa_supplicant/ F: package/wireless_tools/ F: package/xen/ +F: support/testing/tests/package/br2-external/openjdk/ N: Mauro Condarelli <[email protected]> F: package/mc/
support/testing/tests/package/br2-external/openjdk/Config.in new file +1 -0
@@ -0,0 +1 @@ +source "$BR2_EXTERNAL_OPENJDK_PATH/package/openjdk-hello-world/Config.in"
support/testing/tests/package/br2-external/openjdk/external.desc new file +1 -0
@@ -0,0 +1 @@ +name: OPENJDK
support/testing/tests/package/br2-external/openjdk/external.mk new file +1 -0
@@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_OPENJDK_PATH)/package/*/*.mk))
support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in new file +26 -0
@@ -0,0 +1,26 @@ +config BR2_PACKAGE_OPENJDK_HELLO_WORLD + bool "openjdk hello world" + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_WCHAR # gtk2 -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gtk2 -> glib2 + depends on BR2_USE_MMU # gtk2 -> glib2 + depends on BR2_INSTALL_LIBSTDCPP # gtk2, cups + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # gtk2 -> pango -> harfbuzz + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_OPENJDK + help + Simple class for testing openjdk + +comment "OpenJDK-hello-world needs a glibc toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_XORG7 + depends on !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC
support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java new file +7 -0
@@ -0,0 +1,7 @@ +public class HelloWorld +{ + public static void main(String[] args) + { + System.out.println("Hello, World"); + } +}
support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk new file +18 -0
@@ -0,0 +1,18 @@ +################################################################################ +# +# openjdk hello world +# +################################################################################ + +OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk + +define OPENJDK_HELLO_WORLD_BUILD_CMDS + $(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java + $(HOST_DIR)/bin/javac $(@D)/HelloWorld.java +endef + +define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/HelloWorld.class $(TARGET_DIR)/usr/bin/HelloWorld.class +endef + +$(eval $(generic-package))
support/testing/tests/package/test_openjdk.py new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v7 3/3 openjdk-hello-world: new test
Quoted 191 lines · On Mon, Feb 11, 2019 at 1:12 PM <[email protected]> wrote:
From: Daniel J. Leach <[email protected]>
This test is a simple "Hello, World" integration test of the OpenJDK package.
It compiles the Java app on the host, then runs it on an emulated AARCH64 target and verifies "Hello, World" is printed.
Signed-off-by Daniel J. Leach <[email protected]>Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v3:
- Added this patch to the series.Changes v3 -> v5:
- NoneChanges v5 -> v6:
- Updated .gitlab-ci.yml entry.
- Fixed From: and SOB line.Changes v6 -> v7:
- None.gitlab-ci.yml | 1 + DEVELOPERS | 1 + .../package/br2-external/openjdk/Config.in | 1 + .../br2-external/openjdk/external.desc | 1 + .../package/br2-external/openjdk/external.mk | 1 + .../package/openjdk-hello-world/Config.in | 26 ++++++++++++ .../openjdk-hello-world/HelloWorld.java | 7 ++++ .../openjdk-hello-world.mk | 18 ++++++++ support/testing/tests/package/test_openjdk.py | 42 +++++++++++++++++++ 9 files changed, 98 insertions(+) create mode 100644 support/testing/tests/package/br2-external/openjdk/Config.in create mode 100644 support/testing/tests/package/br2-external/openjdk/external.desc create mode 100644 support/testing/tests/package/br2-external/openjdk/external.mk create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk create mode 100644 support/testing/tests/package/test_openjdk.py.gitlab-ci.yml +1
-0@@ -328,6 +328,7 @@ tests.package.test_ipython.TestIPythonPy2: { extends: .runtime_test } tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test } tests.package.test_lua.TestLua: { extends: .runtime_test } tests.package.test_lua.TestLuajit: { extends: .runtime_test } +tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test } tests.package.test_perl.TestPerl: { extends: .runtime_test } tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test } tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test }DEVELOPERS +1
-0@@ -1478,6 +1478,7 @@ F: package/valijson/ F: package/wpa_supplicant/ F: package/wireless_tools/ F: package/xen/ +F: support/testing/tests/package/br2-external/openjdk/ N: Mauro Condarelli <[email protected]> F: package/mc/support/testing/tests/package/br2-external/openjdk/Config.in new file +1
-0@@ -0,0 +1 @@ +source "$BR2_EXTERNAL_OPENJDK_PATH/package/openjdk-hello-world/Config.in"support/testing/tests/package/br2-external/openjdk/external.desc new file +1
-0@@ -0,0 +1 @@ +name: OPENJDKsupport/testing/tests/package/br2-external/openjdk/external.mk new file +1
-0@@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_OPENJDK_PATH)/package/*/*.mk))support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in new file +26
-0@@ -0,0 +1,26 @@ +config BR2_PACKAGE_OPENJDK_HELLO_WORLD + bool "openjdk hello world" + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_WCHAR # gtk2 -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gtk2 -> glib2 + depends on BR2_USE_MMU # gtk2 -> glib2 + depends on BR2_INSTALL_LIBSTDCPP # gtk2, cups + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # gtk2 -> pango -> harfbuzz + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_OPENJDK + help + Simple class for testing openjdk + +comment "OpenJDK-hello-world needs a glibc toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_XORG7 + depends on !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBCsupport/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java new file +7
-0@@ -0,0 +1,7 @@ +public class HelloWorld +{ + public static void main(String[] args) + { + System.out.println("Hello, World"); + } +}support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk new file +18
-0@@ -0,0 +1,18 @@ +################################################################################ +# +# openjdk hello world +# +################################################################################ + +OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk + +define OPENJDK_HELLO_WORLD_BUILD_CMDS + $(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java + $(HOST_DIR)/bin/javac $(@D)/HelloWorld.java +endef + +define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/HelloWorld.class $(TARGET_DIR)/usr/bin/HelloWorld.class +endef + +$(eval $(generic-package))support/testing/tests/package/test_openjdk.py new file +29
-0@@ -0,0 +1,42 @@ +import os + +import infra.basetest + + +class TestOpenJdk(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/openjdk")] + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + BR2_PACKAGE_XORG7=y + BR2_PACKAGE_OPENJDK=y + BR2_PACKAGE_OPENJDK_HELLO_WORLD=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64",
support/testing/tests/package/test_openjdk.py line 39
Quoted 10 lines
support/testing/tests/package/test_openjdk.py new file +10
-0+ kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + cmd = "java -cp /usr/bin HelloWorld" + output, exit_code = self.emulator.run(cmd)
Please update to have a timeout of 120 sec.
PATCH v7 1/3 openjdk: new package
In reply to aduskett at gmail.comAdam,
Quoted 149 lines · On Mon, Feb 11, 2019 at 1:12 PM <[email protected]> wrote:
From: Adam Duskett <[email protected]>
OpenJDK is a free and open-source implementation of the Java Platform. This package provides the option to build a client or a server JVM interpreter.
The default option is the server option, as that is what the majority of users use. This JVM interpreter loads more slowly, putting more effort into JIT compilations to yield higher performance.
Unlike most autotools packages, OpenJDK is exceptionally different and has many quirks, some of which are below:
- X11, alsa, and cups are required to build Java, even if it's a headless build.
See http://hg.openjdk.java.net/jdk10/jdk10/raw-file/tip/common/doc/building.html#external-library-requirements
for more information.- host-zip is needed for the zip executable.
- There is no
autogen.shfile, instead, a user must call "./configure autogen."- OpenJDK ignores some variables unless passed via the environment. These variables are: PATH, LD, CC, CXX, and CPP.
- OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as arguments during the linking process, which causes linking failures. To fix this issue, ld is set to gcc.
- If ccache is enabled, Buildroot sets CC, CXX, and CPP to the ccache binary, which causes the configuration error:
"Please use --enable-ccache instead of providing a wrapped compiler." This error is why CC, CPP, and CXX are explicitly set to point to their actual binaries.- Make -jn is unsupported. Instead, one must use the "--with-jobs=" configure option, and use $(MAKE1).
- Even when cross-compiling, OpenJDK builds several host-tools using the host's gcc. In the case of zlib, if a host doesn't have the zlib development package installed, OpenJDK compilation stops because
zlib.hwon't exist on the host system. Because zlib is used to compile both native tools and cross-compiled tools, patching make/autoconf/lib-bundled.m4 to callPKG_CHECK_MODULESfor zlib results in the host gcc trying to use cross-compiled libraries for compiling native tools, which results in linking failures.
Using --with-zlib=bundled allows OpenJDK to compile correctly.Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Fixed the patch name.Changes v2 -> v3:
- Changed the install location of the libraries and binaries to$(TARGET_DIR)/bin and $(TARGET_DIR)/lib.- Changed -with-boot-jdk location to $(HOST_DIR)/openjdk
- Added a more in-depth commit message explaining some of the my reasoning for some of the quirks in the package files.
Changes v3 -> v4:
- Changed GPLv2+ -> GPL-2.0+ (Thomas)
- AddedBR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTSto Config.in
- Removed first person wordage. (Thomas)Changes v4 -> v5:
- Add jpeg, giflib, libpng, and zlib as dependencies. (Thomas)
- Remove dependencies that aren't necessary. (Thomas)
- Add better comments in the openjdk.mk file. (Matthew)
- Change --with-boot-jdk location to just $(HOST_DIR)
- Use newer Oracle provided cpu port for aarch64.
- Update version to 11.0.2+9Changes v5 -> v6:
- Added comment about zlib in the commit message.
- Added LCMS2 as a dependency.
- Added more comments in Config.in
- Added host-zip as a dependency in openjdk.mk.
- Drop zlib as a dependency (See above comment.)
- Changed --with-zlib=system to --with-zlib=bundled (See above comment.)
- Cleaned up grammar in openjdk.mk.
- Removed uneededconf_optsin openjdk.mk.
- Reverted previous change of --with-cpu-port=aarch64 to --with-cpu-port=arm64. This change breaks compiling, with missing calls to NativePltCall.Changes v6 -> v7:
- Removed AArch64 support in favor of a separate patch.
OpenJDK works on AArch64 without the option; it just isn't as fast. This change makes the patch set follow section 21.5.1 of the Buildroot manual:
"The patch itself should do only one change, but do it completely."
- Fix typos (Thomas)
- Clean up spacing in oppenjdk.mk (Thomas)
- Add more explanations to the commit message (Thomas)
- Clean up grammar in the openjdk.mk comments.
- Clean up grammar in the commit message.
- Reword many of the comments in the openjdk.mk file to better explain why the reasoning behind the logic.
- Remove --prefix from configure options. This option is used only if "make install" is called.
- Removed --with-extra-path=$(HOST_DIR)/bin:$(HOST_DIR)/sbin, as this is also not needed.
- Change cp -rf to cp -dpfr for theOPENJDK_INSTALL_TARGET_CMDSstep.DEVELOPERS | 1 + package/Config.in | 1 + package/openjdk/Config.in | 56 +++++++++++++++++ package/openjdk/openjdk.hash | 3 + package/openjdk/openjdk.mk | 114 +++++++++++++++++++++++++++++++++++ 5 files changed, 175 insertions(+) create mode 100644 package/openjdk/Config.in create mode 100644 package/openjdk/openjdk.hash create mode 100644 package/openjdk/openjdk.mkDEVELOPERS +1
-0@@ -50,6 +50,7 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/nginx-naxsi/ +F: package/openjdk/ F: package/openjdk-bin/ F: package/policycoreutils/ F: package/python-flask-sqlalchemy/package/Config.in +1
-0@@ -668,6 +668,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL menu "Perl libraries/modules"package/openjdk/Config.in new file +3
-0@@ -0,0 +1,56 @@ +config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + bool + default y if BR2_HOSTARCH = "x86_64"
package/openjdk/Config.in line 13
Quoted 10 lines
package/openjdk/Config.in new file +10
-0+ +config BR2_PACKAGE_OPENJDK + bool "OpenJDK" + depends on !BR2_SOFT_FLOAT + depends on !BR2_STATIC_LIBS # Glibc + depends on BR2_INSTALL_LIBSTDCPP # cups + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_MMU # cups + depends on BR2_PACKAGE_XORG7
I was getting setup to test this on powerpc and noticed it would be good to have a conditional comment about requiring xorg if it isn't enabled. Maybe break that out from the comment below that requires both the toolchain and xorg dependencies before displaying the note.
package/openjdk/Config.in line 54
Quoted 9 lines
package/openjdk/Config.in new file +7
-0+ +comment "OpenJDK needs X11, glibc, and a toolchain w/ wchar, dynamic library, threads, C++" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_XORG7 + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC +
Matt