mirror of
https://github.com/ostreedev/ostree.git
synced 2025-02-20 01:59:07 +03:00
ostbuild: Ensure private libraries are in runtime, and kill .la files
A regular libfoo.so not in one of the regular directories should go in runtime. (Probably we should double check it's a regular file too). Also, delete .la files unconditionally.
This commit is contained in:
parent
bdfde03b61
commit
acca018e57
@ -26,11 +26,16 @@ import select,time
|
||||
|
||||
tempfiles = []
|
||||
|
||||
_blacklist_regexps = map(re.compile,
|
||||
[r'.*\.la$',
|
||||
])
|
||||
|
||||
_devel_regexps = map(re.compile,
|
||||
[r'/usr/include/',
|
||||
r'/usr/share/pkgconfig/',
|
||||
r'/.*lib(?:|(?:32)|(?:64))/pkgconfig/.*\.pc',
|
||||
r'/.*lib(?:|(?:32)|(?:64))/.*\.so$'])
|
||||
r'/(?:usr/)lib(?:|(?:32)|(?:64))/pkgconfig/.*\.pc$',
|
||||
r'/(?:usr/)lib(?:|(?:32)|(?:64))/[^/]+\.so$'
|
||||
])
|
||||
|
||||
root = None
|
||||
|
||||
@ -289,6 +294,16 @@ def phase_make_artifacts(builddir=None):
|
||||
for root, dirs, files in os.walk('.'):
|
||||
for filename in files:
|
||||
path = os.path.join(root, filename)
|
||||
|
||||
blacklisted = False
|
||||
for r in _blacklist_regexps:
|
||||
if r.match(path):
|
||||
blacklisted = True
|
||||
break
|
||||
|
||||
if blacklisted:
|
||||
continue
|
||||
|
||||
matched = False
|
||||
for r in _devel_regexps:
|
||||
if not r.match(path[1:]):
|
||||
|
Loading…
x
Reference in New Issue
Block a user