From f1ceb8474deb3670a9a1cd86e283e4fffd162bc6 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 4 Jan 2018 14:19:09 +0100 Subject: jamvm: avoid checking x11 distro feature for native build x11 is not a mandatory distro feature for building jamvm-native, so avoid checking it for native build, or else it would lead parsing errors. Signed-off-by: Ming Liu Signed-off-by: Otavio Salvador --- recipes-core/jamvm/jamvm.inc | 3 ++- recipes-core/jamvm/jamvm_git.bb | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index da1ca29..7a6b6b6 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -15,8 +15,9 @@ RPROVIDES_${PN}_class-native = "" BBCLASSEXTEND = "native" +inherit java autotools update-alternatives pkgconfig relative_symlinks distro_features_check -inherit java autotools update-alternatives pkgconfig relative_symlinks +REQUIRED_DISTRO_FEATURES_class-target = "x11" # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index 6bbfa52..1762ade 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -3,10 +3,6 @@ require jamvm.inc -inherit distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - SRCREV = "6cef41d859fbc9ce7868a97cb2cb5dd2b10b9103" PV = "2.0.0-devel+git${SRCPV}" -- cgit v1.2.3-54-g00ecf