From 04d5d0bf414c05ca59618d77f17ff9898aa1c566 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Tue, 8 Dec 2015 14:51:50 +0100 Subject: 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 --- recipes-core/xml-commons/jaxp1.3_1.4.01.bb | 4 +--- recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | 6 +++--- recipes-core/xml-commons/xpp2_2.1.10.bb | 2 -- recipes-core/xml-commons/xpp3_1.1.3.4.O.bb | 2 -- 4 files changed, 4 insertions(+), 10 deletions(-) (limited to 'recipes-core/xml-commons') diff --git a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb index a6eeb57..765b766 100644 --- a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb +++ b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb @@ -11,9 +11,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "http://archive.apache.org/dist/xml/commons/source/xml-commons-external-${PV}-src.tar.gz;subdir=${BPN}-${PV}" -inherit java-library - -DEPENDS = "fastjar-native" +inherit java-library java-bootstrap-components JARFILENAME = "jaxp-1.3.jar" ALTJARFILENAMES = "xml-apis.jar" diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb index 5853895..ca1f2f2 100644 --- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb +++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb @@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.resolver.txt;md5=d229da563da18fe5d58cd95a6467 SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" -inherit java-library +inherit java-library java-bootstrap-components S = "${WORKDIR}/xml-commons-resolver-${PV}" -DEPENDS = "fastjar-native jaxp1.3" -DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" +DEPENDS = "jaxp1.3" +DEPENDS_virtclass-native = "jaxp1.3-native" do_unpackpost() { find src -exec \ diff --git a/recipes-core/xml-commons/xpp2_2.1.10.bb b/recipes-core/xml-commons/xpp2_2.1.10.bb index d3baca4..402d38d 100644 --- a/recipes-core/xml-commons/xpp2_2.1.10.bb +++ b/recipes-core/xml-commons/xpp2_2.1.10.bb @@ -9,8 +9,6 @@ S = "${WORKDIR}/PullParser${PV}" inherit java-library -DEPENDS = "fastjar-native virtual/javac-native" - do_compile() { if [ -d build-oe ]; then rm -rf build-oe diff --git a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb index bedb8a9..a472a0d 100644 --- a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb +++ b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb @@ -8,8 +8,6 @@ SRC_URI = "http://www.extreme.indiana.edu/dist/java-repository/xpp3/distribution inherit java-library -DEPENDS = "fastjar-native virtual/javac-native" - PACKAGES = "libxpp3-xpath-java ${JPN}" do_compile() { -- cgit v1.2.3-54-g00ecf