* [Buildroot] [PATCH 1/1] package/openjdk: remove mips support @ 2019-04-15 21:14 aduskett at gmail.com 2019-04-15 21:14 ` [Buildroot] [PATCH 2/2] package/openjdk: only support a single variant at a time aduskett at gmail.com 2019-04-17 6:52 ` [Buildroot] [PATCH 1/1] package/openjdk: remove mips support Thomas Petazzoni 0 siblings, 2 replies; 4+ messages in thread From: aduskett at gmail.com @ 2019-04-15 21:14 UTC (permalink / raw) To: buildroot From: Adam Duskett <Aduskett@gmail.com> The mips-port project has been abandoned for some time. https://mail.openjdk.java.net/pipermail/mips-port/2018-August/000082.html Fixes: http://autobuild.buildroot.net/results/1059026c9b5f503684fe1589cd43d25a8484290b/build-end.log Signed-off-by: Adam Duskett <Aduskett@gmail.com> --- package/openjdk/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 1363587ed5..de0efcc86b 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS 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 -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/openjdk: only support a single variant at a time 2019-04-15 21:14 [Buildroot] [PATCH 1/1] package/openjdk: remove mips support aduskett at gmail.com @ 2019-04-15 21:14 ` aduskett at gmail.com 2019-04-15 21:18 ` Thomas Petazzoni 2019-04-17 6:52 ` [Buildroot] [PATCH 1/1] package/openjdk: remove mips support Thomas Petazzoni 1 sibling, 1 reply; 4+ messages in thread From: aduskett at gmail.com @ 2019-04-15 21:14 UTC (permalink / raw) To: buildroot From: Adam Duskett <Aduskett@gmail.com> Selecting multiple variants doesn't seem to be that important in the context of Buildroot. This patch removes the ability to select multiple variants in favor of just selecting one. The default is server as that is what all of the major distributions currently use as the default as well. Fixes: http://autobuild.buildroot.net/results/a45cfa9b3602fd05f6adbf070a1bad6510975c36/build-end.log Signed-off-by: Adam Duskett <Aduskett@gmail.com> --- package/openjdk/Config.in | 16 +++++++++------- package/openjdk/openjdk.mk | 9 ++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index de0efcc86b..61294ec49f 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -41,10 +41,6 @@ config BR2_PACKAGE_OPENJDK select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_ZLIB - # make sure at least one variant is enabled - select BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER \ - if !BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT && !BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO && !BR2_powerpc - select BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc help OpenJDK is a free and open-source implementation of the Java Platform. @@ -53,20 +49,25 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk variant" + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc + config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT - bool "build client variant" + bool "client" depends on !BR2_powerpc help Quick loading, but slower run-time performance. config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER - bool "build server variant" + bool "server" depends on !BR2_powerpc help Slower loading, but faster run-time performance. config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO - bool "build zero variant" + bool "zero" select BR2_PACKAGE_LIBFFI help A non-assembler variant with wide arch support, however @@ -74,6 +75,7 @@ config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO http://openjdk.java.net/projects/zero +endchoice endif comment "openjdk needs X.Org" diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 3f7b87ca96..b59e26778f 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -34,16 +34,15 @@ OPENJDK_DEPENDENCIES = \ # JVM variants ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT),y) -OPENJDK_JVM_VARIANTS += client +OPENJDK_JVM_VARIANT = client endif ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER),y) -OPENJDK_JVM_VARIANTS += server +OPENJDK_JVM_VARIANT = server endif ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO),y) -OPENJDK_JVM_VARIANTS += zero +OPENJDK_JVM_VARIANT = zero OPENJDK_DEPENDENCIES += libffi endif -OPENJDK_JVM_VARIANT_LIST = $(subst $(space),$(comma),$(OPENJDK_JVM_VARIANTS)) # OpenJDK ignores some variables unless passed via the environment. # These variables are PATH, LD, CC, CXX, and CPP. @@ -75,7 +74,7 @@ OPENJDK_CONF_OPTS = \ --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ --with-giflib=system \ --with-jobs=$(PARALLEL_JOBS) \ - --with-jvm-variants=$(OPENJDK_JVM_VARIANT_LIST) \ + --with-jvm-variants=$(OPENJDK_JVM_VARIANT) \ --with-lcms=system \ --with-libjpeg=system \ --with-libpng=system \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/openjdk: only support a single variant at a time 2019-04-15 21:14 ` [Buildroot] [PATCH 2/2] package/openjdk: only support a single variant at a time aduskett at gmail.com @ 2019-04-15 21:18 ` Thomas Petazzoni 0 siblings, 0 replies; 4+ messages in thread From: Thomas Petazzoni @ 2019-04-15 21:18 UTC (permalink / raw) To: buildroot On Mon, 15 Apr 2019 17:14:28 -0400 aduskett at gmail.com wrote: > From: Adam Duskett <Aduskett@gmail.com> > > Selecting multiple variants doesn't seem to be that important in the context of > Buildroot. This patch removes the ability to select multiple variants in favor > of just selecting one. > > The default is server as that is what all of the major distributions currently > use as the default as well. > > Fixes: > http://autobuild.buildroot.net/results/a45cfa9b3602fd05f6adbf070a1bad6510975c36/build-end.log Ideally this commit log should have explained that enabling the zero variant cannot be done together with enabling the client or server variant, but expressing that with Config.in dependencies was deemed too complicated. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/openjdk: remove mips support 2019-04-15 21:14 [Buildroot] [PATCH 1/1] package/openjdk: remove mips support aduskett at gmail.com 2019-04-15 21:14 ` [Buildroot] [PATCH 2/2] package/openjdk: only support a single variant at a time aduskett at gmail.com @ 2019-04-17 6:52 ` Thomas Petazzoni 1 sibling, 0 replies; 4+ messages in thread From: Thomas Petazzoni @ 2019-04-17 6:52 UTC (permalink / raw) To: buildroot Hello, On Mon, 15 Apr 2019 17:14:27 -0400 aduskett at gmail.com wrote: > From: Adam Duskett <Aduskett@gmail.com> > > The mips-port project has been abandoned for some time. > https://mail.openjdk.java.net/pipermail/mips-port/2018-August/000082.html > > Fixes: > http://autobuild.buildroot.net/results/1059026c9b5f503684fe1589cd43d25a8484290b/build-end.log We typically use just http://autobuild.buildroot.net/results/1059026c9b5f503684fe1589cd43d25a8484290b/, not the URL to the build log specifically. Also, an empty line before the SoB line was missing. I fixed both nits and applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-17 6:52 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-04-15 21:14 [Buildroot] [PATCH 1/1] package/openjdk: remove mips support aduskett at gmail.com 2019-04-15 21:14 ` [Buildroot] [PATCH 2/2] package/openjdk: only support a single variant at a time aduskett at gmail.com 2019-04-15 21:18 ` Thomas Petazzoni 2019-04-17 6:52 ` [Buildroot] [PATCH 1/1] package/openjdk: remove mips support Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.