Skip to contentSkip to conversation

Revert "Avoid parse time errors due to dependency on x11, for distros without x11"

PATCH In review Jens Rehsack 1 participant 1 message Oct 16, 2015

lore
Share & tools
lore

Jens Rehsack

author
#0 lore raw

PATCH 2/5 Revert "Avoid parse time errors due to dependency on x11, for distros 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 24b98ac3a6ca7fadfba24709aac8d0b71316e299.

Signed-off-by Jens Rehsack <[email protected]>
---
 recipes-core/cacao/cacao_1.6.1.bb       | 4 +---
 recipes-core/classpath/classpath.inc    | 4 +---
 recipes-core/jamvm/jamvm.inc            | 4 +---
 recipes-core/openjdk/openjdk-common.inc | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)
recipes-core/cacao/cacao_1.6.1.bb +1 -3
index 564dd1e..65aaf93 100644
@@ -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 \
recipes-core/classpath/classpath.inc +1 -3
index 0f760fe..1bdfd78 100644
@@ -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"
recipes-core/jamvm/jamvm.inc +1 -3
index e00813e..5893cbc 100644
@@ -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"
recipes-core/openjdk/openjdk-common.inc +1 -3
index e3e597a..dc26522 100644
@@ -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.
Signature · 5 lines
2.4.3


-- 
Jens Rehsack - [email protected]