diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-10-03 01:38:21 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-10-03 01:38:21 +0000 |
| commit | 405af4acf4c38300e5d9a6492d349f26e6b239f0 (patch) | |
| tree | a1e62118a181b6c0ad6b02ccebdfce8a1aa89ccf | |
| parent | 6363e3b999c1600278e2f65cde6e3f839211299d (diff) | |
| parent | cc25c30cd5285bda5f6043e6f27fa819498c6a0b (diff) | |
merge of '56ab51a0342466f50234f11f4d4685b642943d6a'
and 'd247017786a0b1f7180e909014da50635ba53f26'
| -rw-r--r-- | packages/ecj/ecj-bootstrap-native.bb | 4 | ||||
| -rw-r--r-- | packages/jamvm/jamvm-native.inc | 8 | ||||
| -rw-r--r-- | packages/jamvm/jamvm-native_1.5.1.bb | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/packages/ecj/ecj-bootstrap-native.bb b/packages/ecj/ecj-bootstrap-native.bb index 04f8ba4062..2bda972207 100644 --- a/packages/ecj/ecj-bootstrap-native.bb +++ b/packages/ecj/ecj-bootstrap-native.bb @@ -9,7 +9,7 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "EPL" -DEPENDS = "libecj-bootstrap" +DEPENDS = "libecj-bootstrap virtual/java-native" PROVIDES = "virtual/javac-native" @@ -17,6 +17,8 @@ SRC_URI = "file://ecj.in" S = "${WORKDIR}" +PR = "r1" + JAR = "ecj-bootstrap.jar" inherit native diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc index fc9023a62c..c3e4f84a60 100644 --- a/packages/jamvm/jamvm-native.inc +++ b/packages/jamvm/jamvm-native.inc @@ -1,9 +1,9 @@ require jamvm.inc -DEPENDS = "zlib-native classpath-native virtual/javac-native" +DEPENDS = "zlib-native classpath-native ecj-initial" RDEPENDS = "" -PROVIDES_jamvm = "virtual/java-native" +PROVIDES = "virtual/java-native" RPROVIDES_jamvm = "" @@ -17,3 +17,7 @@ S = "${WORKDIR}/jamvm-${PV}" do_install_append() { ln -sf jamvm ${STAGING_BINDIR}/java } + +# Enforce usage of ecj-initial. +export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" + diff --git a/packages/jamvm/jamvm-native_1.5.1.bb b/packages/jamvm/jamvm-native_1.5.1.bb index e174e2a312..3b42dbbef6 100644 --- a/packages/jamvm/jamvm-native_1.5.1.bb +++ b/packages/jamvm/jamvm-native_1.5.1.bb @@ -1,4 +1,4 @@ require jamvm-native.inc -PR = "r0" +PR = "r1" |