From 11e30f2bf198bcad91c0d14104fcd8b91255ad69 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Tue, 29 Sep 2015 15:18:07 +0200 Subject: [PATCH] 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. --- 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(-) diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb index 564dd1e..65aaf93 100644 --- a/recipes-core/cacao/cacao_1.6.1.bb +++ b/recipes-core/cacao/cacao_1.6.1.bb @@ -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 \ 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" 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" 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 \ " -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" diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index e3e597a..dc26522 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc @@ -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.