diff options
Diffstat (limited to 'meta')
-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 e3f0a7060b..5e51b89184 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -2079,12 +2079,12 @@ python package_do_pkgconfig () { | |||
2079 | for pkg in packages.split(): | 2079 | for pkg in packages.split(): |
2080 | pkgconfig_provided[pkg] = [] | 2080 | pkgconfig_provided[pkg] = [] |
2081 | pkgconfig_needed[pkg] = [] | 2081 | pkgconfig_needed[pkg] = [] |
2082 | for file in pkgfiles[pkg]: | 2082 | for file in sorted(pkgfiles[pkg]): |
2083 | m = pc_re.match(file) | 2083 | m = pc_re.match(file) |
2084 | if m: | 2084 | if m: |
2085 | pd = bb.data.init() | 2085 | pd = bb.data.init() |
2086 | name = m.group(1) | 2086 | name = m.group(1) |
2087 | pkgconfig_provided[pkg].append(name) | 2087 | pkgconfig_provided[pkg].append(os.path.basename(name)) |
2088 | if not os.access(file, os.R_OK): | 2088 | if not os.access(file, os.R_OK): |
2089 | continue | 2089 | continue |
2090 | with open(file, 'r') as f: | 2090 | with open(file, 'r') as f: |
@@ -2107,7 +2107,7 @@ python package_do_pkgconfig () { | |||
2107 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") | 2107 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") |
2108 | if pkgconfig_provided[pkg] != []: | 2108 | if pkgconfig_provided[pkg] != []: |
2109 | with open(pkgs_file, 'w') as f: | 2109 | with open(pkgs_file, 'w') as f: |
2110 | for p in pkgconfig_provided[pkg]: | 2110 | for p in sorted(pkgconfig_provided[pkg]): |
2111 | f.write('%s\n' % p) | 2111 | f.write('%s\n' % p) |
2112 | 2112 | ||
2113 | # Go from least to most specific since the last one found wins | 2113 | # Go from least to most specific since the last one found wins |