All pastes #405001 Raw Edit

Someone

public text v1 · immutable
·published 2007-03-21 13:16 UTC
rendered paste body
hrw@home:~/devel/oe/org.openembedded/classes$ mtn dif .
#
# old_revision [8b675ccc53dfab5cb741e302ba279dca3cd6cf5c]
#
# patch "classes/package.bbclass"
#  from [11f1fb0bda9849ac1e65a798ecb45a9d4818f571]
#    to [3bdada841d96d89fd4e45c9693e9049da3f73f78]
#
============================================================
--- classes/package.bbclass     11f1fb0bda9849ac1e65a798ecb45a9d4818f571
+++ classes/package.bbclass     3bdada841d96d89fd4e45c9693e9049da3f73f78
@@ -572,6 +572,7 @@ python package_do_shlibs() {
        old_shlibs_dir = os.path.join(staging, "shlibs")
        bb.mkdirhier(shlibs_dir)

+       shlib_provider = {}
        needed = {}
        for pkg in packages.split():
                needs_ldconfig = False
@@ -597,6 +598,8 @@ python package_do_shlibs() {
                                                m = re.match("\s+SONAME\s+([^\s]*)", l)
                                                if m and not m.group(1) in sonames:
                                                        sonames.append(m.group(1))
+                                                       shlib_provider[m.group(1).rstrip()] = ('name', 'ver')
+                                                       needed[pkg].remove(m.group(1))
                                                if m and libdir_re.match(root):
                                                        needs_ldconfig = True
                shlibs_file = os.path.join(shlibs_dir, pkg + ".list")
@@ -621,7 +624,6 @@ python package_do_shlibs() {
                        postinst += bb.data.getVar('ldconfig_postinst_fragment', d, 1)
                        bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)

-       shlib_provider = {}
        list_re = re.compile('^(.*)\.list$')
        for dir in [old_shlibs_dir, shlibs_dir]:
                if not os.path.exists(dir):
hrw@home:~/devel/oe/org.openembedded/classes$