summaryrefslogtreecommitdiffstats
path: root/classes/java-library.bbclass
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-05-24 00:21:10 -0700
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-09-29 21:49:54 +0200
commit0087b9260ba3ebc8098d8d87c08d4eea05070f39 (patch)
treebc6afc9a09e57bce8cc8f3d38b8b7413eb88fc06 /classes/java-library.bbclass
parentbac4a2703747dbe7644bb9c9bee331dc1ecc6ac1 (diff)
downloadmeta-java-0087b9260ba3ebc8098d8d87c08d4eea05070f39.tar.gz
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>
Diffstat (limited to 'classes/java-library.bbclass')
-rw-r--r--classes/java-library.bbclass9
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):
19 pre="" 19 pre=""
20 post="" 20 post=""
21 21
22 pn = bb.data.getVar('PN', d, 1) 22 bpn = bb.data.getVar('BPN', d, 1)
23 if not pn.startswith("lib"): 23 ml = bb.data.getVar('MLPREFIX', d, 1)
24 if not bpn.startswith("lib"):
24 pre='lib' 25 pre='lib'
25 26
26 if not pn.endswith("-java"): 27 if not bpn.endswith("-java"):
27 post='-java' 28 post='-java'
28 29
29 return pre + pn + post 30 return ml + pre + bpn + post
30 31
31JPN ?= "${@java_package_name(d)}" 32JPN ?= "${@java_package_name(d)}"
32 33