diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2015-12-22 22:26:16 -0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-01-04 09:21:06 -0200 |
commit | ec7b984fbd0662b7aa1707f229ab09c555bb2cf6 (patch) | |
tree | ddcccc61cad8998e96506319c30d12acd6edbfdb /recipes-core/xml-commons | |
parent | af90e3a9473e529dcbb4e7392a62f1d5c592f717 (diff) | |
download | meta-java-ec7b984fbd0662b7aa1707f229ab09c555bb2cf6.tar.gz |
Revert "meta-java: rely on well known bootstrap-path"
This reverts commit 04d5d0bf414c05ca59618d77f17ff9898aa1c566.
Detail reason is in the following commit.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Diffstat (limited to 'recipes-core/xml-commons')
-rw-r--r-- | recipes-core/xml-commons/jaxp1.3_1.4.01.bb | 4 | ||||
-rw-r--r-- | recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | 6 | ||||
-rw-r--r-- | recipes-core/xml-commons/xpp2_2.1.10.bb | 2 | ||||
-rw-r--r-- | recipes-core/xml-commons/xpp3_1.1.3.4.O.bb | 2 |
4 files changed, 10 insertions, 4 deletions
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 765b766..a6eeb57 100644 --- a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb +++ b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb | |||
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | SRC_URI = "http://archive.apache.org/dist/xml/commons/source/xml-commons-external-${PV}-src.tar.gz;subdir=${BPN}-${PV}" | 12 | SRC_URI = "http://archive.apache.org/dist/xml/commons/source/xml-commons-external-${PV}-src.tar.gz;subdir=${BPN}-${PV}" |
13 | 13 | ||
14 | inherit java-library java-bootstrap-components | 14 | inherit java-library |
15 | |||
16 | DEPENDS = "fastjar-native" | ||
15 | 17 | ||
16 | JARFILENAME = "jaxp-1.3.jar" | 18 | JARFILENAME = "jaxp-1.3.jar" |
17 | ALTJARFILENAMES = "xml-apis.jar" | 19 | 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 ca1f2f2..5853895 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 | |||
6 | 6 | ||
7 | SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" | 7 | SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" |
8 | 8 | ||
9 | inherit java-library java-bootstrap-components | 9 | inherit java-library |
10 | 10 | ||
11 | S = "${WORKDIR}/xml-commons-resolver-${PV}" | 11 | S = "${WORKDIR}/xml-commons-resolver-${PV}" |
12 | 12 | ||
13 | DEPENDS = "jaxp1.3" | 13 | DEPENDS = "fastjar-native jaxp1.3" |
14 | DEPENDS_virtclass-native = "jaxp1.3-native" | 14 | DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" |
15 | 15 | ||
16 | do_unpackpost() { | 16 | do_unpackpost() { |
17 | find src -exec \ | 17 | 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 402d38d..d3baca4 100644 --- a/recipes-core/xml-commons/xpp2_2.1.10.bb +++ b/recipes-core/xml-commons/xpp2_2.1.10.bb | |||
@@ -9,6 +9,8 @@ S = "${WORKDIR}/PullParser${PV}" | |||
9 | 9 | ||
10 | inherit java-library | 10 | inherit java-library |
11 | 11 | ||
12 | DEPENDS = "fastjar-native virtual/javac-native" | ||
13 | |||
12 | do_compile() { | 14 | do_compile() { |
13 | if [ -d build-oe ]; then | 15 | if [ -d build-oe ]; then |
14 | rm -rf build-oe | 16 | 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 a472a0d..bedb8a9 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,6 +8,8 @@ SRC_URI = "http://www.extreme.indiana.edu/dist/java-repository/xpp3/distribution | |||
8 | 8 | ||
9 | inherit java-library | 9 | inherit java-library |
10 | 10 | ||
11 | DEPENDS = "fastjar-native virtual/javac-native" | ||
12 | |||
11 | PACKAGES = "libxpp3-xpath-java ${JPN}" | 13 | PACKAGES = "libxpp3-xpath-java ${JPN}" |
12 | 14 | ||
13 | do_compile() { | 15 | do_compile() { |