diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 460997ad54..985dfacd09 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -2112,12 +2112,12 @@ python package_do_pkgconfig () { | |||
2112 | for pkg in packages.split(): | 2112 | for pkg in packages.split(): |
2113 | pkgconfig_provided[pkg] = [] | 2113 | pkgconfig_provided[pkg] = [] |
2114 | pkgconfig_needed[pkg] = [] | 2114 | pkgconfig_needed[pkg] = [] |
2115 | for file in pkgfiles[pkg]: | 2115 | for file in sorted(pkgfiles[pkg]): |
2116 | m = pc_re.match(file) | 2116 | m = pc_re.match(file) |
2117 | if m: | 2117 | if m: |
2118 | pd = bb.data.init() | 2118 | pd = bb.data.init() |
2119 | name = m.group(1) | 2119 | name = m.group(1) |
2120 | pkgconfig_provided[pkg].append(name) | 2120 | pkgconfig_provided[pkg].append(os.path.basename(name)) |
2121 | if not os.access(file, os.R_OK): | 2121 | if not os.access(file, os.R_OK): |
2122 | continue | 2122 | continue |
2123 | with open(file, 'r') as f: | 2123 | with open(file, 'r') as f: |
@@ -2140,7 +2140,7 @@ python package_do_pkgconfig () { | |||
2140 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") | 2140 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") |
2141 | if pkgconfig_provided[pkg] != []: | 2141 | if pkgconfig_provided[pkg] != []: |
2142 | with open(pkgs_file, 'w') as f: | 2142 | with open(pkgs_file, 'w') as f: |
2143 | for p in pkgconfig_provided[pkg]: | 2143 | for p in sorted(pkgconfig_provided[pkg]): |
2144 | f.write('%s\n' % p) | 2144 | f.write('%s\n' % p) |
2145 | 2145 | ||
2146 | # Go from least to most specific since the last one found wins | 2146 | # Go from least to most specific since the last one found wins |