java-library.bbclass: consider multilib

when multilib is enabled the prefix begins with lib32-
and thats got wrong when computing JPN. Lets make sure
that mlprefix is handled properly while constructing
JPN for multilib package e.g.

lib32-dbus-java will now create lib32-libdbus-java
instead of lib32-dbus-java which was same as PN
and caused warnings like

WARNING: Variable key FILES_${PN} (${bindir}/* ${sbindir}/*
${libexecdir}/* ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir}
${localstatedir} ${base_bindir}/* ${base_sbindir}/*
${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev/rules.d
${prefix}/lib/udev/rules.d ${datadir}/${BPN} ${libdir}/${BPN}/*
${datadir}/pixmaps ${datadir}/applications ${datadir}/idl ${datadir}/omf
${datadir}/sounds ${libdir}/bonobo/servers) replaces original key
FILES_lib32-dbus-java (${datadir_java}).

Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 52c932c..a74c8d3 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -19,14 +19,15 @@ def java_package_name(d):
   pre=""
   post=""
 
-  pn = bb.data.getVar('PN', d, 1)
-  if not pn.startswith("lib"):
+  bpn = bb.data.getVar('BPN', d, 1)
+  ml = bb.data.getVar('MLPREFIX', d, 1)
+  if not bpn.startswith("lib"):
     pre='lib'
 
-  if not pn.endswith("-java"):
+  if not bpn.endswith("-java"):
     post='-java'
 
-  return pre + pn + post
+  return ml + pre + bpn + post
 
 JPN ?= "${@java_package_name(d)}"