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 3ff74c9f31..702427fecc 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1989,12 +1989,12 @@ python package_do_pkgconfig () { | |||
1989 | for pkg in packages.split(): | 1989 | for pkg in packages.split(): |
1990 | pkgconfig_provided[pkg] = [] | 1990 | pkgconfig_provided[pkg] = [] |
1991 | pkgconfig_needed[pkg] = [] | 1991 | pkgconfig_needed[pkg] = [] |
1992 | for file in pkgfiles[pkg]: | 1992 | for file in sorted(pkgfiles[pkg]): |
1993 | m = pc_re.match(file) | 1993 | m = pc_re.match(file) |
1994 | if m: | 1994 | if m: |
1995 | pd = bb.data.init() | 1995 | pd = bb.data.init() |
1996 | name = m.group(1) | 1996 | name = m.group(1) |
1997 | pkgconfig_provided[pkg].append(name) | 1997 | pkgconfig_provided[pkg].append(os.path.basename(name)) |
1998 | if not os.access(file, os.R_OK): | 1998 | if not os.access(file, os.R_OK): |
1999 | continue | 1999 | continue |
2000 | with open(file, 'r') as f: | 2000 | with open(file, 'r') as f: |
@@ -2017,7 +2017,7 @@ python package_do_pkgconfig () { | |||
2017 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") | 2017 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") |
2018 | if pkgconfig_provided[pkg] != []: | 2018 | if pkgconfig_provided[pkg] != []: |
2019 | with open(pkgs_file, 'w') as f: | 2019 | with open(pkgs_file, 'w') as f: |
2020 | for p in pkgconfig_provided[pkg]: | 2020 | for p in sorted(pkgconfig_provided[pkg]): |
2021 | f.write('%s\n' % p) | 2021 | f.write('%s\n' % p) |
2022 | 2022 | ||
2023 | # Go from least to most specific since the last one found wins | 2023 | # Go from least to most specific since the last one found wins |