Skip to content
Snippets Groups Projects
Commit 57301606 authored by Simon McVittie's avatar Simon McVittie
Browse files

build-relocatable-install: Don't wrap steam-runtime-system-info


If we wrap steam-runtime-system-info in a shell script, its argv[0]
will be ld.so, which makes it fail to find its own relocatable prefix
in _srt_find_myself().

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 3008ba5e
No related branches found
No related tags found
1 merge request!189Include vulkaninfo and wflinfo in relocatable installs
...@@ -84,7 +84,6 @@ DEPENDENCIES = { ...@@ -84,7 +84,6 @@ DEPENDENCIES = {
# program to install => binary package # program to install => binary package
WRAPPED_PROGRAMS = { WRAPPED_PROGRAMS = {
'bwrap': 'bubblewrap', 'bwrap': 'bubblewrap',
'steam-runtime-system-info': 'steam-runtime-tools-bin',
} }
PRIMARY_ARCH_DEPENDENCIES = { PRIMARY_ARCH_DEPENDENCIES = {
'bubblewrap': 'bubblewrap', 'bubblewrap': 'bubblewrap',
...@@ -109,6 +108,7 @@ EXECUTABLES = [ ...@@ -109,6 +108,7 @@ EXECUTABLES = [
'pressure-vessel-launcher', 'pressure-vessel-launcher',
'pressure-vessel-try-setlocale', 'pressure-vessel-try-setlocale',
'pressure-vessel-wrap', 'pressure-vessel-wrap',
'steam-runtime-system-info',
] ]
LIBCAPSULE_TOOLS = [ LIBCAPSULE_TOOLS = [
'capsule-capture-libs', 'capsule-capture-libs',
...@@ -275,10 +275,15 @@ def main(): ...@@ -275,10 +275,15 @@ def main():
) )
for exe in EXECUTABLES: for exe in EXECUTABLES:
install_exe( path = os.path.join(args.pv_dir, 'bin', exe)
os.path.join(args.pv_dir, 'bin', exe),
os.path.join(installation, 'bin'), if not os.path.exists(path):
) path = os.path.join(args.prefix, 'bin', exe)
if not os.path.exists(path):
path = '/usr/bin/{}'.format(exe)
install_exe(path, os.path.join(installation, 'bin'))
install( install(
os.path.join(args.srcdir, 'pressure-vessel', 'THIRD-PARTY.md'), os.path.join(args.srcdir, 'pressure-vessel', 'THIRD-PARTY.md'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment