package.bbclass: don't mix armhf deps

[openembedded.git] / classes / package.bbclass

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 662b0db..dcfa7cf 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -715,12 +715,15 @@ python package_do_shlibs() {
 
        shlib_provider = {}
        list_re = re.compile('^(.*)\.list$')
+       armhf_re = re.compile('^(armhf.*)\.list$')
        for dir in [shlibs_dir]: 
                if not os.path.exists(dir):
                        continue
                for file in os.listdir(dir):
                        m = list_re.match(file)
                        if m:
+                               if bool(armhf_re.match(file)) != pkg.startswith('armhf'):
+                                       continue
                                dep_pkg = m.group(1)
                                fd = open(os.path.join(dir, file))
                                lines = fd.readlines()