From 3918402ea146a93747170de3a3fd266ec89e521f Mon Sep 17 00:00:00 2001
From: André Draszik <andre.draszik@jci.com>
Date: Wed, 25 Apr 2018 16:02:58 +0100
Subject: classpath: harmonise -native and -initial-native recipes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../classpath/classpath-initial-native_0.93.bb     | 54 ++++++++++------------
 1 file changed, 25 insertions(+), 29 deletions(-)

(limited to 'recipes-core/classpath/classpath-initial-native_0.93.bb')

diff --git a/recipes-core/classpath/classpath-initial-native_0.93.bb b/recipes-core/classpath/classpath-initial-native_0.93.bb
index 0cfa693..51229ec 100644
--- a/recipes-core/classpath/classpath-initial-native_0.93.bb
+++ b/recipes-core/classpath/classpath-initial-native_0.93.bb
@@ -4,7 +4,6 @@
 require classpath-native.inc
 
 DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
-LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510"
 DEPENDS += "jikes-native"
 
 PR = "${INC_PR}.2"
@@ -13,38 +12,35 @@ SRC_URI += " \
 	    file://autotools.patch \
 	    file://miscompilation.patch \
 	   "
+SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d"
+SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945"
 
-EXTRA_OECONF = " \
-                --with-jikes=jikes \
-                --with-fastjar=fastjar \
-                --with-glibj \
-                --disable-Werror \
-                --disable-local-sockets \
-                --disable-alsa \
-                --disable-gconf-peer \
-                --disable-gtk-peer \
-                --disable-plugin \
-                --disable-dssi \
-                --disable-examples \
-                --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \
-                --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \
-                --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \
-                --with-vm=java \
-              "
+EXTRA_OECONF += "\
+    --with-jikes=jikes \
+    --with-fastjar=fastjar \
+    --disable-local-sockets \
+    --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \
+    --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \
+    --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \
+    --with-vm=java \
+"
 
 # Ensure tools.zip is not installed at same path as classpath-native
 EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial"
 
-# remove files clashing with classpath-native in sysroot
 do_install_append() {
-
-	for i in gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid
-	do
-		rm ${D}${bindir}/${i}
-	done
-	rm ${D}${libdir}/logging.properties
-	rm ${D}${libdir}/security/classpath.security
+    # remove files clashing with classpath-native in sysroot
+    rm \
+       ${D}${bindir}/gappletviewer \
+       ${D}${bindir}/gjarsigner \
+       ${D}${bindir}/gkeytool \
+       ${D}${bindir}/gjar \
+       ${D}${bindir}/gnative2ascii \
+       ${D}${bindir}/gserialver \
+       ${D}${bindir}/grmiregistry \
+       ${D}${bindir}/gtnameserv \
+       ${D}${bindir}/gorbd \
+       ${D}${bindir}/grmid \
+       ${D}${libdir}/logging.properties \
+       ${D}${libdir}/security/classpath.security
 }
-SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d"
-SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945"
-
-- 
cgit v1.2.3-54-g00ecf