libc-{common, package}.bbclass: fix shlib renaming for the C library
Submitted by Koen Kooi on June 28, 2011, 4:30 p.m.
|
Patch ID: 6619
Details
Commit Message
@@ -21,3 +21,12 @@ def get_libc_fpu_setting(bb, d):
if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
return "--without-fp"
return ""
+# We want to do this indirection so that we can safely 'return'
+# from the called function even though we're prepending
+python populate_packages_prepend () {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bpn = bb.data.getVar('BPN', d, 1)
+ bb.data.setVar('PKG_'+bpn, 'libc6', d)
+ bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d)
+ bb.build.exec_func('package_do_split_gconvs', d)
+}
@@ -364,13 +364,3 @@ python package_do_split_gconvs () {
bb.note("generation of binary locales disabled. this may break i18n!")
}
-
-# We want to do this indirection so that we can safely 'return'
-# from the called function even though we're prepending
-python populate_packages_prepend () {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bpn = bb.data.getVar('BPN', d, 1)
- bb.data.setVar('PKG_'+bpn, 'libc6', d)
- bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d)
- bb.build.exec_func('package_do_split_gconvs', d)
-}
Without this you'd end up with eglibc_2.12.ipk instead of libc6_2.12.ipk as before Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- meta/classes/libc-common.bbclass | 9 +++++++++ meta/classes/libc-package.bbclass | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-)