Patchwork [meta-java] java missign classes during compile

login
register
mail settings
Submitter Amy Fong
Date Sept. 24, 2013, 9:03 p.m.
Message ID <20130924210322.GA14153@windriver.com>
Download mbox | patch
Permalink /patch/58949/
State New, archived
Headers show

Comments

Amy Fong - Sept. 24, 2013, 9:03 p.m.
From 2182b6f32502ce3e614dafa0d1292ab728613211 Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Tue, 24 Sep 2013 16:59:38 -0400
Subject: [PATCH] java missing classes during compile

oe_makeclasspath uses an invalid test to see the package is native.
(testing if the build arch and package arch are the same, if so, native)

Rather, we test to see if PN is *-native or *-nativesdk.

Signed-off-by: Amy Fong <amy.fong@windriver.com>
---
 classes/java.bbclass |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Patch

diff --git a/classes/java.bbclass b/classes/java.bbclass
index 464d8a8..ab51787 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -98,11 +98,14 @@  oe_makeclasspath() {
       case "$1" in
           -s)
               # take jar files from native staging if this is a -native recipe
-              if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
+              case "$PN" in
+              *-native|*-nativesdk)
                   dir=${STAGING_DATADIR_JAVA_NATIVE}
-              else
+                  ;;
+              *)
                   dir=${STAGING_DATADIR_JAVA}
-              fi
+                  ;;
+              esac
               ;;
           -*)
               bbfatal "oe_makeclasspath: unknown option: $1"