[oe-commits] : java.bbclass: Make oe_makeclasspath automatically use staging or staging native.
OE GIT Trial
gittrial at amethyst.openembedded.net
Fri Oct 10 15:22:16 UTC 2008
Module: org.openembedded.dev.git
Branch: org.openembedded.dev
Commit: 62d20207a7484ca39ebd0d29c14d9e6954841f91
URL: http://gitweb.openembedded.net/?p=org.openembedded.dev.git&a=commit;h=62d20207a7484ca39ebd0d29c14d9e6954841f91
Author: <thebohemian at openembedded.org>
Date: Fri Oct 10 14:45:56 2008 +0000
java.bbclass: Make oe_makeclasspath automatically use staging or staging native.
---
classes/java.bbclass | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 620dae7..32415d5 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -17,6 +17,10 @@ STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java
STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni
STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm
+STAGING_DATADIR_JAVA_NATIVE ?= ${STAGING_DATADIR_NATIVE}/java
+STAGING_LIBDIR_JNI_NATIVE ?= ${STAGING_LIBDIR_NATIVE}/jni
+STAGING_LIBDIR_JVM_NATIVE ?= ${STAGING_LIBDIR_NATIVE}/jvm
+
oe_jarinstall() {
# Purpose: Install a jar file and create all the given symlinks to it.
# Example:
@@ -34,7 +38,12 @@ oe_jarinstall() {
while [ "$#" -gt 0 ]; do
case "$1" in
-s)
- dir=${STAGING_DATADIR_JAVA}
+ # put jar files to native staging if this is a -native recipe
+ if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
+ dir=${STAGING_DATADIR_JAVA_NATIVE}
+ else
+ dir=${STAGING_DATADIR_JAVA}
+ fi
;;
-r)
shift
@@ -95,7 +104,12 @@ oe_makeclasspath() {
while [ "$#" -gt 0 ]; do
case "$1" in
-s)
- dir=${STAGING_DATADIR_JAVA}
+ # take jar files from native staging if this is a -native recipe
+ if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
+ dir=${STAGING_DATADIR_JAVA_NATIVE}
+ else
+ dir=${STAGING_DATADIR_JAVA}
+ fi
;;
-*)
oefatal "oe_makeclasspath: unknown option: $1"
More information about the Openembedded-commits
mailing list