diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9543cd8abadd8536a8494b08971cb80e59fcf044..d292cd35e792da3706c1ae7476f487ec68e4b135 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 87ae78d92c3c8640107bb0e6f2d3a9d45cd17242..4e0febbe9ddd0adf782da9a9c4607318df43da65 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 e64ec6454ee85ac1e2be6aca6c3ac151a8f76100..02d71b653505de67a459fe9a75c429828e318a4c 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 a440f5c055b1208529d6c7b7a3a3de7bb34394c6..cba6f7c5966dc07179c8f2539b11f54b7193bb11 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')