From ecd8de1d8a26f3c46a282aafdc48504a31e61e5c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 26 Aug 2015 16:09:47 -0300 Subject: Revert "Don't depend on a hardcoded compiler" This reverts commit 15ed9662e26ed4ac8d843fb9d2335a49a9c03088. The change has break external builds causing build failures. The change here needs to be revisited to avoid the breakages and than re-applied. Signed-off-by: Otavio Salvador --- recipes-core/cacao/cacao_1.6.1.bb | 2 +- recipes-core/classpath/classpath-native_0.99.bb | 2 +- recipes-core/jamvm/jamvm.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb index d52f339..564dd1e 100644 --- a/recipes-core/cacao/cacao_1.6.1.bb +++ b/recipes-core/cacao/cacao_1.6.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "interpreters" -DEPENDS_class-native = "zlib-native libtool-native virtual/javac-native fastjar-native classpath-native bdwgc-native" +DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-native bdwgc-native" PROVIDES_class-native = "virtual/java-native" DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc" diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb index cf297d9..02951b9 100644 --- a/recipes-core/classpath/classpath-native_0.99.bb +++ b/recipes-core/classpath/classpath-native_0.99.bb @@ -1,7 +1,7 @@ require classpath-native.inc LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" -DEPENDS += "virtual/javac-native" +DEPENDS += "ecj-initial-native" PR = "${INC_PR}.0" diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index 9d9fef6..e00813e 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib classpath virtual/javac-native libffi" -DEPENDS_virtclass-native = "zlib-native classpath-native virtual/javac-native libffi-native" +DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native" RDEPENDS_${PN} = "classpath" RDEPENDS_${PN}_virtclass-native = "" -- cgit v1.2.3-54-g00ecf