diff options
author | Jens Rehsack <rehsack@gmail.com> | 2015-10-28 18:58:24 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-29 09:02:28 -0200 |
commit | a88718b6a6ec2a9429cbfd364d590ae69eb661e4 (patch) | |
tree | 7b55fc01182e0c5802f35d0414053503b27c6dce /recipes-core/jamvm | |
parent | df20f2d68ba63e0acfb54c1947bd24a01a74f444 (diff) | |
download | meta-java-a88718b6a6ec2a9429cbfd364d590ae69eb661e4.tar.gz |
Avoid parse time errors due to dependency on x11, for distros without x11
BitBake raises some errors when processing recipes that depend on x11
for distros that don't have x11 in DISTRO_FEATURES. To work around
that issue, REQUIRED_DISTRO_FEATURES = "x11" (from
distro_features_check.bbclass) has been set for the following recipes:
* cacao (_class-target)
* classpath (_class-target)
* jamvm (_class-target)
* openjdk-7-release
That makes BitBake skip those recipes during the cache generation
(they'd still be parsed, but ignored).
This patch improves the idea from Mario Domenech Goulart <mario@ossystems.com.br>
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Acked-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/jamvm')
-rw-r--r-- | recipes-core/jamvm/jamvm.inc | 4 | ||||
-rw-r--r-- | recipes-core/jamvm/jamvm_git.bb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index e00813e..5893cbc 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc | |||
@@ -21,9 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ | |||
21 | " | 21 | " |
22 | 22 | ||
23 | 23 | ||
24 | inherit java autotools update-alternatives pkgconfig distro_features_check | 24 | inherit java autotools update-alternatives pkgconfig |
25 | |||
26 | REQUIRED_DISTRO_FEATURES = "x11" | ||
27 | 25 | ||
28 | # This uses 32 bit arm, so force the instruction set to arm, not thumb | 26 | # This uses 32 bit arm, so force the instruction set to arm, not thumb |
29 | ARM_INSTRUCTION_SET = "arm" | 27 | ARM_INSTRUCTION_SET = "arm" |
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index 07eed6a..63364aa 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb | |||
@@ -3,6 +3,10 @@ | |||
3 | 3 | ||
4 | require jamvm.inc | 4 | require jamvm.inc |
5 | 5 | ||
6 | inherit distro_features_check | ||
7 | |||
8 | REQUIRED_DISTRO_FEATURES = "x11" | ||
9 | |||
6 | SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719" | 10 | SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719" |
7 | PV = "1.5.5+1.6.0-devel+git${SRCPV}" | 11 | PV = "1.5.5+1.6.0-devel+git${SRCPV}" |
8 | 12 | ||