classpath: harmonise -native and -initial-native recipes

removing lots of code-duplication

Signed-off-by: André Draszik <andre.draszik@jci.com>
Tested-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>

1 files changed, 15 insertions, 16 deletions

diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb
index a97cae0..a1e1e0f 100644
--- a/recipes-core/classpath/classpath-native_0.99.bb
+++ b/recipes-core/classpath/classpath-native_0.99.bb
@@ -1,6 +1,5 @@
 require classpath-native.inc
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510"
 DEPENDS += "classpath-initial-native ecj-initial-native virtual/java-initial-native"
 
 PR = "${INC_PR}.0"
@@ -12,21 +11,21 @@ SRC_URI += " \
             file://miscompilation.patch \
             file://toolwrapper-exithook.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] = "0ae1571249172acd82488724a3b8acb4"
 SRC_URI[sha256sum] = "f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8"
 
+EXTRA_OECONF += "\
+    --enable-local-sockets \
+    --disable-gjdoc \
+    --enable-tools \
+    --includedir=${STAGING_INCDIR}/classpath \
+"
+
+do_compile_append () {
+    # tools using java-initial rather than java sed it out
+    cd tools
+    sed -e "s/java-initial/java/g" \
+        -i gappletviewer gjarsigner gkeytool \
+           gjar gnative2ascii gserialver grmiregistry \
+           gtnameserv gorbd grmid grmic gjavah
+}