Skip to content

Commit

Permalink
Revert "Avoid parse time errors due to dependency on x11, for distros…
Browse files Browse the repository at this point in the history
… without x11"

Since OpenJDK-8 builds find without x11 and icedtea does either (native
builds), the restriction is a bit to hasty.

This reverts commit 24b98ac.
  • Loading branch information
rehsack committed Oct 16, 2015
1 parent a739393 commit 11e30f2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
4 changes: 1 addition & 3 deletions recipes-core/cacao/cacao_1.6.1.bb
Expand Up @@ -15,9 +15,7 @@ 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 distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"
inherit java autotools-brokensep update-alternatives pkgconfig

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

PBN = "classpath"

inherit autotools java gettext distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"
inherit autotools java gettext

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

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


inherit java autotools update-alternatives pkgconfig distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"
inherit java autotools update-alternatives pkgconfig

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

inherit java autotools gettext qemu pkgconfig distro_features_check

REQUIRED_DISTRO_FEATURES = "x11"
inherit java autotools gettext qemu pkgconfig

# 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 11e30f2

Please sign in to comment.