summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/java.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/java.bbclass b/classes/java.bbclass
index fc97295..7b9677a 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -80,8 +80,6 @@ oe_makeclasspath() {
80 # in variable "bootcp". 80 # in variable "bootcp".
81 # 81 #
82 # Provide the -s at the beginning otherwise strange things happen. 82 # Provide the -s at the beginning otherwise strange things happen.
83 # If -s is given the function checks whether the requested jar file exists
84 # and exits with an error message if it cannot be found.
85 # 83 #
86 # Note: In order to encourage usage of the DEPENDS variable, the function 84 # Note: In order to encourage usage of the DEPENDS variable, the function
87 # can accept recipe names. If a recipe has no corresponding Jar file it 85 # can accept recipe names. If a recipe has no corresponding Jar file it
@@ -91,6 +89,7 @@ oe_makeclasspath() {
91 classpath= 89 classpath=
92 delimiter= 90 delimiter=
93 retval=$1 91 retval=$1
92 staging=false
94 93
95 shift 94 shift
96 95
@@ -106,6 +105,7 @@ oe_makeclasspath() {
106 dir=${STAGING_DATADIR_JAVA} 105 dir=${STAGING_DATADIR_JAVA}
107 ;; 106 ;;
108 esac 107 esac
108 staging=true
109 ;; 109 ;;
110 -*) 110 -*)
111 bbfatal "oe_makeclasspath: unknown option: $1" 111 bbfatal "oe_makeclasspath: unknown option: $1"
@@ -113,9 +113,9 @@ oe_makeclasspath() {
113 *) 113 *)
114 file=$dir/$1.jar 114 file=$dir/$1.jar
115 115
116 if [ -e $file ]; then 116 if [ $staging == false ] || [ -e $file ]; then
117 classpath=$classpath$delimiter$file 117 classpath=$classpath$delimiter$file
118 delimiter=":" 118 delimiter=":"
119 fi 119 fi
120 120
121 ;; 121 ;;