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
e1b6c526
Commit
e1b6c526
authored
5 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
build: Always build with relocatable RPATH
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
328b849f
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+0
-1
0 additions, 1 deletion
.gitlab-ci.yml
README.md
+1
-1
1 addition, 1 deletion
README.md
meson.build
+2
-10
2 additions, 10 deletions
meson.build
meson_options.txt
+0
-1
0 additions, 1 deletion
meson_options.txt
with
3 additions
and
13 deletions
.gitlab-ci.yml
+
0
−
1
View file @
e1b6c526
...
@@ -47,7 +47,6 @@ build:scout:
...
@@ -47,7 +47,6 @@ build:scout:
meson \
meson \
--prefix="$(pwd)/_build/relocatable-install" \
--prefix="$(pwd)/_build/relocatable-install" \
-Dpython=python3.5 \
-Dpython=python3.5 \
-Drelocatable=true \
_build
_build
ninja -C _build
ninja -C _build
ninja -C _build install
ninja -C _build install
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
e1b6c526
...
@@ -149,7 +149,7 @@ and bubblewrap in your build environment. For example, you could do the
...
@@ -149,7 +149,7 @@ and bubblewrap in your build environment. For example, you could do the
build in a SteamRT 1 'scout' SDK Docker image that has those packages
build in a SteamRT 1 'scout' SDK Docker image that has those packages
already. Then you can do:
already. Then you can do:
meson --prefix=$(pwd)/_build/relocatable-install
-Drelocatable=true
_build
meson --prefix=$(pwd)/_build/relocatable-install _build
ninja -C _build
ninja -C _build
rm -fr $(pwd)/_build/relocatable-install
rm -fr $(pwd)/_build/relocatable-install
meson test -v -C _build # optional
meson test -v -C _build # optional
...
...
This diff is collapsed.
Click to expand it.
meson.build
+
2
−
10
View file @
e1b6c526
...
@@ -152,15 +152,6 @@ configure_file(
...
@@ -152,15 +152,6 @@ configure_file(
configuration
:
conf_data
,
configuration
:
conf_data
,
)
)
if
get_option
(
'relocatable'
)
rpath_kwargs
=
{
'build_rpath'
:
'${ORIGIN}/../'
+
get_option
(
'libdir'
),
'install_rpath'
:
'${ORIGIN}/../'
+
get_option
(
'libdir'
),
}
else
rpath_kwargs
=
{}
endif
executable
(
executable
(
'pressure-vessel-wrap'
,
'pressure-vessel-wrap'
,
sources
:
[
sources
:
[
...
@@ -184,7 +175,8 @@ executable(
...
@@ -184,7 +175,8 @@ executable(
],
],
install
:
true
,
install
:
true
,
install_dir
:
get_option
(
'bindir'
),
install_dir
:
get_option
(
'bindir'
),
kwargs
:
rpath_kwargs
,
build_rpath
:
'${ORIGIN}/../'
+
get_option
(
'libdir'
),
install_rpath
:
'${ORIGIN}/../'
+
get_option
(
'libdir'
),
)
)
# vim:set sw=2 sts=2 et:
# vim:set sw=2 sts=2 et:
This diff is collapsed.
Click to expand it.
meson_options.txt
+
0
−
1
View file @
e1b6c526
option
(
'python'
,
type
:
'string'
,
value
:
'python3'
)
option
(
'python'
,
type
:
'string'
,
value
:
'python3'
)
option
(
'relocatable'
,
type
:
'boolean'
,
value
:
false
)
option
(
'version'
,
type
:
'string'
,
value
:
'auto'
)
option
(
'version'
,
type
:
'string'
,
value
:
'auto'
)
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