jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 07:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/openjdk: only support a single variant at a time

Browse Source 
The Zero variant won't build with the server or client also selected at the same
time, and expressing this in the Config.in would be too complicated to do.
Even so, 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

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adam Duskett 2019-04-17 10:33:25 -04:00 committed by Thomas Petazzoni
parent 31161bfe9c
commit 946ba7252b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/openjdk/Config.in
View File

@ -41,10 +41,6 @@ config BR2_PACKAGE_OPENJDK
select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXT
select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_ZLIB 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 help
OpenJDK is a free and open-source implementation of the OpenJDK is a free and open-source implementation of the
Java Platform. Java Platform.
@ -53,20 +49,25 @@ config BR2_PACKAGE_OPENJDK
if 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 config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT
bool "build client variant" bool "client"
depends on !BR2_powerpc depends on !BR2_powerpc
help help
Quick loading, but slower run-time performance. Quick loading, but slower run-time performance.
config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER
bool "build server variant" bool "server"
depends on !BR2_powerpc depends on !BR2_powerpc
help help
Slower loading, but faster run-time performance. Slower loading, but faster run-time performance.
config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO
bool "build zero variant" bool "zero"
select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_LIBFFI
help help
A non-assembler variant with wide arch support, however 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 http://openjdk.java.net/projects/zero
endchoice
endif endif
comment "openjdk needs X.Org" comment "openjdk needs X.Org"

9
package/openjdk/openjdk.mk
View File

@ -34,16 +34,15 @@ OPENJDK_DEPENDENCIES = \
# JVM variants # JVM variants
ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT),y) ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT),y)
OPENJDK_JVM_VARIANTS += client OPENJDK_JVM_VARIANT = client
endif endif
ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER),y) ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER),y)
OPENJDK_JVM_VARIANTS += server OPENJDK_JVM_VARIANT = server
endif endif
ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO),y) ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO),y)
OPENJDK_JVM_VARIANTS += zero OPENJDK_JVM_VARIANT = zero
OPENJDK_DEPENDENCIES += libffi OPENJDK_DEPENDENCIES += libffi
endif endif
OPENJDK_JVM_VARIANT_LIST = $(subst $(space),$(comma),$(OPENJDK_JVM_VARIANTS))
# OpenJDK ignores some variables unless passed via the environment. # OpenJDK ignores some variables unless passed via the environment.
# These variables are PATH, LD, CC, CXX, and CPP. # These variables are PATH, LD, CC, CXX, and CPP.
@ -75,7 +74,7 @@ OPENJDK_CONF_OPTS = \
--with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \
--with-giflib=system \ --with-giflib=system \
--with-jobs=$(PARALLEL_JOBS) \ --with-jobs=$(PARALLEL_JOBS) \
--with-jvm-variants=$(OPENJDK_JVM_VARIANT_LIST) \ --with-jvm-variants=$(OPENJDK_JVM_VARIANT) \
--with-lcms=system \ --with-lcms=system \
--with-libjpeg=system \ --with-libjpeg=system \
--with-libpng=system \ --with-libpng=system \