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/classpath | |
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/classpath')
-rw-r--r-- | recipes-core/classpath/classpath.inc | 4 | ||||
-rw-r--r-- | recipes-core/classpath/classpath_0.99.bb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index 0f760fe..1bdfd78 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc | |||
@@ -7,9 +7,7 @@ LICENSE = "Classpath" | |||
7 | 7 | ||
8 | PBN = "classpath" | 8 | PBN = "classpath" |
9 | 9 | ||
10 | inherit autotools java gettext distro_features_check | 10 | inherit autotools java gettext |
11 | |||
12 | REQUIRED_DISTRO_FEATURES = "x11" | ||
13 | 11 | ||
14 | DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file" | 12 | DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file" |
15 | 13 | ||
diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 8b3a6e3..6aa3baa 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb | |||
@@ -1,5 +1,9 @@ | |||
1 | require classpath.inc | 1 | require classpath.inc |
2 | 2 | ||
3 | inherit distro_features_check | ||
4 | |||
5 | REQUIRED_DISTRO_FEATURES = "x11" | ||
6 | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a" |
4 | 8 | ||
5 | SRC_URI += " \ | 9 | SRC_URI += " \ |