From d32ba89d34c930b52fba9a78d7c3581f08f6f3d0 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 9 Dec 2015 15:15:08 +0800 Subject: antlr/cup: inherit java-bootstrap-components This should be part of the following commit but missed: commit 04d5d0bf414c05ca59618d77f17ff9898aa1c566 Author: Jens Rehsack Date: Tue Dec 8 14:51:50 2015 +0100 meta-java: rely on well known bootstrap-path Instead of potential circular depending virtual/javac-native (even this recipe provides such a useable java-native), rely on well known path via cacao-native to build up to icedtea7-native in reliable manner. virtual/javac-native should be used by parts not belonging to the bootstrap phase. Signed-off-by: Jens Rehsack Signed-off-by: Maxin B. John Signed-off-by: Jackie Huang Signed-off-by: Otavio Salvador --- recipes-core/antlr/antlr_2.7.7.bb | 2 +- recipes-core/cup/cup_0.10k.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/antlr/antlr_2.7.7.bb b/recipes-core/antlr/antlr_2.7.7.bb index 9d9d2d4..cff9535 100644 --- a/recipes-core/antlr/antlr_2.7.7.bb +++ b/recipes-core/antlr/antlr_2.7.7.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=361934e706423915b4d9f413ad37fb65" SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz" SRC_URI_append_class-native = " file://runantlr" -inherit java-library +inherit java-library java-bootstrap-components do_configure_class-native() { sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb index 2a957f9..f2f254e 100644 --- a/recipes-core/cup/cup_0.10k.bb +++ b/recipes-core/cup/cup_0.10k.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c RDEPENDS_${PN} = "java2-runtime" RDEPENDS_${PN}_virtclass-native = "" -inherit java-library +inherit java-library java-bootstrap-components SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/CUP/java_${BPN}_v10k.tar.gz \ file://cup \ -- cgit v1.2.3-54-g00ecf