summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-11-14 10:39:41 +0100
committerRobert Schuster <thebohemian@gmx.net>2008-11-14 10:40:44 +0100
commit06d6c5c9a035a9ac5c77d9e86d6a27749b72388d (patch)
treeb59765283038774902d34ce65eae4a1bf127baca /packages
parent83a3a4d6da863a37c3b1f8f550564d42e4ea19e9 (diff)
openjdk-langtools-native: Add virtual/java-native to DEPENDS (the tools need a runtime otherwise there are useless)
Diffstat (limited to 'packages')
-rw-r--r--packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb8
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb b/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
index 1533818c00..9b857a171a 100644
--- a/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
+++ b/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Java Language tools (sun-javac, javah, javap, javadoc and apt) fr
HOMEPAGE = "http://http://openjdk.java.net/groups/compiler"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
-DEPENDS = "classpath-native fastjar-native ecj-initial"
+DEPENDS = "classpath-native fastjar-native ecj-initial virtual/java-native"
S = "${WORKDIR}/icepick-0.0+hg20080118"
@@ -27,9 +27,11 @@ EXTRA_OECONF = "\
export JAVAC_OPTS="-bootclasspath ${STAGING_DATADIR_JAVA}/share/classpath/glibj.zip -source 5.0"
do_stage_append() {
+ [ -f ${bindir}/sun-javac ] && rm ${bindir}/sun-javac
+
# Provide javac as sun-javac to not clash with the binary of the same
# name in ecj-bootstrap-native.
# This way ecj-bootstrap-native and openjdk-langtools-native can coexist
# in staging dir.
- mv ${bindir}/javac ${bindir}/sun-javac
+ mv -f ${bindir}/javac ${bindir}/sun-javac
}