From: Robert Schuster <thebohemian@gmx.net>
Date: Fri, 14 Nov 2008 08:35:33 +0000 (+0100)
Subject: openjdk-langtools-native: Rename 'javac' to 'sun-javac' when installing to staging.
X-Git-Tag: Release-2010-05/1~5350^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0833c193ce38d965b5ab4becacb2a9d1520ebf3c;p=openembedded.git

openjdk-langtools-native: Rename 'javac' to 'sun-javac' when installing to staging.
---

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 3f90e4a7dd..1533818c00 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
@@ -1,7 +1,9 @@
-DESCRIPTION = "Java Language tools (javac, javah, javap, javadoc and apt) from OpenJDK"
+DESCRIPTION = "Java Language tools (sun-javac, javah, javap, javadoc and apt) from OpenJDK"
 HOMEPAGE = "http://http://openjdk.java.net/groups/compiler"
 LICENSE  = "GPL"
 
+PR = "r1"
+
 DEPENDS = "classpath-native fastjar-native ecj-initial"
 
 S = "${WORKDIR}/icepick-0.0+hg20080118"
@@ -23,3 +25,11 @@ EXTRA_OECONF = "\
   "
 
 export JAVAC_OPTS="-bootclasspath ${STAGING_DATADIR_JAVA}/share/classpath/glibj.zip -source 5.0"
+
+do_stage_append() {
+	# 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
+}