diff options
-rw-r--r-- | meta/classes/package.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 8609e75354..4794f0ece1 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1521,7 +1521,8 @@ python package_do_shlibs() { | |||
1521 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 1521 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
1522 | 1522 | ||
1523 | list_re = re.compile('^(.*)\.list$') | 1523 | list_re = re.compile('^(.*)\.list$') |
1524 | for dir in shlibs_dirs: | 1524 | # Go from least to most specific since the last one found wins |
1525 | for dir in reversed(shlibs_dirs): | ||
1525 | if not os.path.exists(dir): | 1526 | if not os.path.exists(dir): |
1526 | continue | 1527 | continue |
1527 | for file in os.listdir(dir): | 1528 | for file in os.listdir(dir): |
@@ -1643,7 +1644,8 @@ python package_do_pkgconfig () { | |||
1643 | f.write('%s\n' % p) | 1644 | f.write('%s\n' % p) |
1644 | f.close() | 1645 | f.close() |
1645 | 1646 | ||
1646 | for dir in shlibs_dirs: | 1647 | # Go from least to most specific since the last one found wins |
1648 | for dir in reversed(shlibs_dirs): | ||
1647 | if not os.path.exists(dir): | 1649 | if not os.path.exists(dir): |
1648 | continue | 1650 | continue |
1649 | for file in os.listdir(dir): | 1651 | for file in os.listdir(dir): |