diff options
Diffstat (limited to 'meta/lib/oe/package.py')
-rw-r--r-- | meta/lib/oe/package.py | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 1511ba47c4..e6b46a0dc5 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py | |||
@@ -195,14 +195,28 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, max_process, qa_alre | |||
195 | 195 | ||
196 | oe.utils.multiprocess_launch_mp(runstrip, sfiles, max_process) | 196 | oe.utils.multiprocess_launch_mp(runstrip, sfiles, max_process) |
197 | 197 | ||
198 | TRANSLATE = ( | ||
199 | ("@", "@at@"), | ||
200 | (" ", "@space@"), | ||
201 | ("\t", "@tab@"), | ||
202 | ("[", "@openbrace@"), | ||
203 | ("]", "@closebrace@"), | ||
204 | ("_", "@underscore@"), | ||
205 | (":", "@colon@"), | ||
206 | ) | ||
198 | 207 | ||
199 | def file_translate(file): | 208 | def file_translate(file): |
200 | ft = file.replace("@", "@at@") | 209 | ft = file |
201 | ft = ft.replace(" ", "@space@") | 210 | for s, replace in TRANSLATE: |
202 | ft = ft.replace("\t", "@tab@") | 211 | ft = ft.replace(s, replace) |
203 | ft = ft.replace("[", "@openbrace@") | 212 | |
204 | ft = ft.replace("]", "@closebrace@") | 213 | return ft |
205 | ft = ft.replace("_", "@underscore@") | 214 | |
215 | def file_reverse_translate(file): | ||
216 | ft = file | ||
217 | for s, replace in reversed(TRANSLATE): | ||
218 | ft = ft.replace(replace, s) | ||
219 | |||
206 | return ft | 220 | return ft |
207 | 221 | ||
208 | def filedeprunner(arg): | 222 | def filedeprunner(arg): |
@@ -1839,7 +1853,7 @@ def process_pkgconfig(pkgfiles, d): | |||
1839 | if m: | 1853 | if m: |
1840 | hdr = m.group(1) | 1854 | hdr = m.group(1) |
1841 | exp = pd.expand(m.group(2)) | 1855 | exp = pd.expand(m.group(2)) |
1842 | if hdr == 'Requires': | 1856 | if hdr == 'Requires' or hdr == 'Requires.private': |
1843 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() | 1857 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() |
1844 | continue | 1858 | continue |
1845 | m = var_re.match(l) | 1859 | m = var_re.match(l) |