classpath-native: sed out java-initial with sed in the tools and bump PR

1 files changed, 16 insertions, 0 deletions

diff --git a/recipes-core/classpath/classpath-native_0.98.bb b/recipes-core/classpath/classpath-native_0.98.bb
index 55022fb..32c3fb3 100644
--- a/recipes-core/classpath/classpath-native_0.98.bb
+++ b/recipes-core/classpath/classpath-native_0.98.bb
@@ -2,6 +2,8 @@ require classpath-native.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510"
 
+PR = "r1"
+
 SRC_URI += " \
             file://SimpleName.diff;striplevel=0 \
             file://sun-security-getproperty.patch;striplevel=0 \
@@ -24,6 +26,20 @@ do_unpackpost() {
 
 addtask unpackpost after do_unpack before do_patch
 
+# tools using java-initial rather than java sed it out
+do_compile_append () {
+
+        COMMANDS="gappletviewer gjarsigner gkeytool \
+                  gjar gnative2ascii gserialver grmiregistry \
+                  gtnameserv gorbd grmid grmic gjavah \
+                 "
+
+        for i in ${COMMANDS};
+        do
+                 sed -i -e "s/java-initial/java/g" tools/${i}
+        done
+}
+
 SRC_URI[md5sum] = "90c6571b8b0309e372faa0f9f6255ea9"
 SRC_URI[sha256sum] = "501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f"