summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2015-12-09 15:15:08 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2015-12-11 15:46:39 -0200
commitd32ba89d34c930b52fba9a78d7c3581f08f6f3d0 (patch)
treee12afce6e7db45206cd4528b97ab943a8a8afb4b
parenta7586e45a2b89ab8ce66ac00a54c0223f08f6804 (diff)
downloadmeta-java-d32ba89d34c930b52fba9a78d7c3581f08f6f3d0.tar.gz
antlr/cup: inherit java-bootstrap-components
This should be part of the following commit but missed: commit 04d5d0bf414c05ca59618d77f17ff9898aa1c566 Author: Jens Rehsack <rehsack@gmail.com> 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 <sno@netbsd.org> Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-core/antlr/antlr_2.7.7.bb2
-rw-r--r--recipes-core/cup/cup_0.10k.bb2
2 files changed, 2 insertions, 2 deletions
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"
7SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz" 7SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz"
8SRC_URI_append_class-native = " file://runantlr" 8SRC_URI_append_class-native = " file://runantlr"
9 9
10inherit java-library 10inherit java-library java-bootstrap-components
11 11
12do_configure_class-native() { 12do_configure_class-native() {
13 sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr 13 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
7RDEPENDS_${PN} = "java2-runtime" 7RDEPENDS_${PN} = "java2-runtime"
8RDEPENDS_${PN}_virtclass-native = "" 8RDEPENDS_${PN}_virtclass-native = ""
9 9
10inherit java-library 10inherit java-library java-bootstrap-components
11 11
12SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/CUP/java_${BPN}_v10k.tar.gz \ 12SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/CUP/java_${BPN}_v10k.tar.gz \
13 file://cup \ 13 file://cup \