diff options
| -rw-r--r-- | meta/lib/oe/package.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index c9eb75d852..7a6b31957a 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py | |||
| @@ -1823,18 +1823,18 @@ def process_pkgconfig(pkgfiles, d): | |||
| 1823 | with open(file, 'r') as f: | 1823 | with open(file, 'r') as f: |
| 1824 | lines = f.readlines() | 1824 | lines = f.readlines() |
| 1825 | for l in lines: | 1825 | for l in lines: |
| 1826 | m = var_re.match(l) | ||
| 1827 | if m: | ||
| 1828 | name = m.group(1) | ||
| 1829 | val = m.group(2) | ||
| 1830 | pd.setVar(name, pd.expand(val)) | ||
| 1831 | continue | ||
| 1832 | m = field_re.match(l) | 1826 | m = field_re.match(l) |
| 1833 | if m: | 1827 | if m: |
| 1834 | hdr = m.group(1) | 1828 | hdr = m.group(1) |
| 1835 | exp = pd.expand(m.group(2)) | 1829 | exp = pd.expand(m.group(2)) |
| 1836 | if hdr == 'Requires': | 1830 | if hdr == 'Requires': |
| 1837 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() | 1831 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() |
| 1832 | continue | ||
| 1833 | m = var_re.match(l) | ||
| 1834 | if m: | ||
| 1835 | name = m.group(1) | ||
| 1836 | val = m.group(2) | ||
| 1837 | pd.setVar(name, pd.expand(val)) | ||
| 1838 | 1838 | ||
| 1839 | for pkg in packages.split(): | 1839 | for pkg in packages.split(): |
| 1840 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") | 1840 | pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") |