diff options
| -rw-r--r-- | meta/classes/package.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index fed2f5531d..67351b2510 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
| @@ -2178,18 +2178,18 @@ python package_do_pkgconfig () { | |||
| 2178 | with open(file, 'r') as f: | 2178 | with open(file, 'r') as f: |
| 2179 | lines = f.readlines() | 2179 | lines = f.readlines() |
| 2180 | for l in lines: | 2180 | for l in lines: |
| 2181 | m = var_re.match(l) | ||
| 2182 | if m: | ||
| 2183 | name = m.group(1) | ||
| 2184 | val = m.group(2) | ||
| 2185 | pd.setVar(name, pd.expand(val)) | ||
| 2186 | continue | ||
| 2187 | m = field_re.match(l) | 2181 | m = field_re.match(l) |
| 2188 | if m: | 2182 | if m: |
| 2189 | hdr = m.group(1) | 2183 | hdr = m.group(1) |
| 2190 | exp = pd.expand(m.group(2)) | 2184 | exp = pd.expand(m.group(2)) |
| 2191 | if hdr == 'Requires': | 2185 | if hdr == 'Requires': |
| 2192 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() | 2186 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() |
| 2187 | continue | ||
| 2188 | m = var_re.match(l) | ||
| 2189 | if m: | ||
| 2190 | name = m.group(1) | ||
| 2191 | val = m.group(2) | ||
| 2192 | pd.setVar(name, pd.expand(val)) | ||
| 2193 | 2193 | ||
| 2194 | for pkg in packages.split(): | 2194 | for pkg in packages.split(): |
| 2195 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") | 2195 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") |