Skip to content

Commit

Permalink
Avoid parse time errors due to dependency on x11, for distros without…
Browse files Browse the repository at this point in the history
… 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
* classpath
* jamvm
* openjdk-6-release
* openjdk-7-release

That makes BitBake skip those recipes during the cache generation
(they'd still be parsed, but ignored).

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
  • Loading branch information
Mario Domenech Goulart authored and otavio committed Aug 18, 2015
1 parent 15ed966 commit 24b98ac
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
4 changes: 3 additions & 1 deletion recipes-core/cacao/cacao_1.6.1.bb
Expand Up @@ -15,7 +15,9 @@ SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-
SRC_URI[md5sum] = "2c18478404afd1cffdd15ad1e9d85a57"
SRC_URI[sha256sum] = "eecc8bd1b528a028f43d9d1d0c06b97855bbf1d40e03826d911ebbc0b6971e12"

inherit java autotools-brokensep update-alternatives pkgconfig
inherit java autotools-brokensep update-alternatives pkgconfig distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"

EXTRA_OECONF_class-native = "\
--enable-debug \
Expand Down
4 changes: 3 additions & 1 deletion recipes-core/classpath/classpath.inc
Expand Up @@ -7,7 +7,9 @@ LICENSE = "Classpath"

PBN = "classpath"

inherit autotools java gettext
inherit autotools java gettext distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"

DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file"

Expand Down
4 changes: 3 additions & 1 deletion recipes-core/jamvm/jamvm.inc
Expand Up @@ -21,7 +21,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
"


inherit java autotools update-alternatives pkgconfig
inherit java autotools update-alternatives pkgconfig distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"

# This uses 32 bit arm, so force the instruction set to arm, not thumb
ARM_INSTRUCTION_SET = "arm"
Expand Down
4 changes: 3 additions & 1 deletion recipes-core/openjdk/openjdk-common.inc
Expand Up @@ -17,7 +17,9 @@ DEPENDS_append_libc-uclibc = " virtual/libiconv "
# because structure sizes and/or alignment may differ.
DEPENDS_append = " qemu-native "

inherit java autotools gettext qemu pkgconfig
inherit java autotools gettext qemu pkgconfig distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"

# OpenJDK uses slightly different names for certain arches. We need to know
# this to create some files which are expected by the build.
Expand Down

0 comments on commit 24b98ac

Please sign in to comment.