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

build: Always build with relocatable RPATH

parent 328b849f
No related branches found
No related tags found
No related merge requests found
...@@ -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
......
...@@ -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
......
...@@ -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:
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')
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