summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-11-14 12:53:49 +0100
committerRobert Schuster <thebohemian@gmx.net>2008-11-14 23:00:22 +0100
commitfa5510fb527b7a4dae11fd96b65f69360c326e3a (patch)
tree1584cab5e9a9ea81f593ecb2a7d4af60d0b199c4
parentca344437bba2733bd3cc8b45fa113d3302e2a981 (diff)
openjdk-langtools-native: Rework do_stage to manually install things.
-rw-r--r--packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb16
1 files changed, 12 insertions, 4 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 9b857a171a..abeea96a0a 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,7 +2,7 @@ DESCRIPTION = "Java Language tools (sun-javac, javah, javap, javadoc and apt) fr
HOMEPAGE = "http://http://openjdk.java.net/groups/compiler"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
DEPENDS = "classpath-native fastjar-native ecj-initial virtual/java-native"
@@ -26,12 +26,20 @@ 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
+do_stage() {
+ # Do install step manually to fine control installation names.
+ install -d ${bindir}
+ install -m 0755 tools/apt ${bindir}
+ install -m 0755 tools/javadoc ${bindir}
+ install -m 0755 tools/javah ${bindir}
+ install -m 0755 tools/javap ${bindir}
# 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 -f ${bindir}/javac ${bindir}/sun-javac
+ install -m 0755 tools/javac ${bindir}/sun-javac
+
+ install -d ${libdir}
+ install -m 0644 tools.jar ${libdir}
}