Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
065e0700
Commit
065e0700
authored
4 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
build-relocatable-install: Try harder to find libsteam-runtime-tools
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
b8f21c31
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#4379
passed
4 years ago
Stage: build
Stage: relocatable-install
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pressure-vessel/build-relocatable-install.py
+32
-2
32 additions, 2 deletions
pressure-vessel/build-relocatable-install.py
with
32 additions
and
2 deletions
pressure-vessel/build-relocatable-install.py
+
32
−
2
View file @
065e0700
...
...
@@ -318,7 +318,12 @@ def main():
os
.
path
.
join
(
installation
,
'
bin
'
),
)
path
=
'
/usr/libexec/steam-runtime-tools-0
'
path
=
os
.
path
.
join
(
args
.
prefix
,
'
libexec
'
,
'
steam-runtime-tools-0
'
,
)
if
not
os
.
path
.
exists
(
path
):
path
=
'
/usr/libexec/steam-runtime-tools-0
'
if
not
os
.
path
.
exists
(
path
):
package
=
'
libsteam-runtime-tools-0-helpers
'
...
...
@@ -373,6 +378,16 @@ def main():
])
if
arch
.
name
==
primary_architecture
:
path
=
os
.
path
.
join
(
args
.
prefix
,
'
lib
'
,
arch
.
multiarch
,
'
libsteam-runtime-tools-0.so.0
'
,
)
if
os
.
path
.
exists
(
path
):
libsrt_pattern
=
'
path:
'
+
path
else
:
libsrt_pattern
=
'
soname:libsteam-runtime-tools-0.so.0
'
v_check_call
([
'
{}/bin/{}-capsule-capture-libs
'
.
format
(
installation
,
...
...
@@ -389,6 +404,7 @@ def main():
'
soname:libjson-glib-1.0.so.0
'
,
'
soname:libpcre.so.3
'
,
'
soname:libselinux.so.1
'
,
libsrt_pattern
,
])
for
so
in
glob
.
glob
(
...
...
@@ -400,7 +416,21 @@ def main():
'
*.so.*
'
,
),
):
install
(
so
,
os
.
path
.
join
(
installation
,
'
lib
'
,
arch
.
multiarch
))
install
(
so
,
os
.
path
.
join
(
installation
,
'
lib
'
,
arch
.
multiarch
,
os
.
path
.
basename
(
so
)
)
)
install
(
so
,
os
.
path
.
join
(
installation
,
'
lib
'
,
arch
.
multiarch
,
'
steam-runtime-tools-0
'
,
os
.
path
.
basename
(
so
)
)
)
# For bwrap (and possibly other programs in future) we don't have
# a relocatable version with a RPATH/RUNPATH, so we wrap a script
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment