From e1b6c5266b2901a12f1b37175be8b0bc4a214992 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 15 Aug 2019 10:06:12 +0100 Subject: [PATCH] build: Always build with relocatable RPATH Signed-off-by: Simon McVittie <smcv@collabora.com> --- .gitlab-ci.yml | 1 - README.md | 2 +- meson.build | 12 ++---------- meson_options.txt | 1 - 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9543cd8ab..d292cd35e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,6 @@ build:scout: meson \ --prefix="$(pwd)/_build/relocatable-install" \ -Dpython=python3.5 \ - -Drelocatable=true \ _build ninja -C _build ninja -C _build install diff --git a/README.md b/README.md index 87ae78d92..4e0febbe9 100644 --- a/README.md +++ b/README.md @@ -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 already. Then you can do: - meson --prefix=$(pwd)/_build/relocatable-install -Drelocatable=true _build + meson --prefix=$(pwd)/_build/relocatable-install _build ninja -C _build rm -fr $(pwd)/_build/relocatable-install meson test -v -C _build # optional diff --git a/meson.build b/meson.build index e64ec6454..02d71b653 100644 --- a/meson.build +++ b/meson.build @@ -152,15 +152,6 @@ configure_file( 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( 'pressure-vessel-wrap', sources : [ @@ -184,7 +175,8 @@ executable( ], install : true, 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: diff --git a/meson_options.txt b/meson_options.txt index a440f5c05..cba6f7c59 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,2 @@ option('python', type : 'string', value : 'python3') -option('relocatable', type : 'boolean', value : false) option('version', type : 'string', value : 'auto') -- GitLab