diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index d7bc4504f23296ec563ee0b0975137234c13100c..07196d10516dd81ccd1cbae392210bbf07583a2c 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -109,7 +109,7 @@ pipeline { sh ''' set -eu cd src - meson --prefix="${WORKSPACE}/src/_build/relocatable-install" -Dpython=python3.5 _build + meson --prefix="${WORKSPACE}/src/_build/relocatable-install" -Dpython=python3.5 -Drelocatable=true _build ninja -C _build ninja -C _build install meson test --verbose -C _build diff --git a/meson.build b/meson.build index a944c143a30dd256db6c2b566a891c56b942bab6..0987d1f72300bf5c1a885cd41fde871a90fa06cb 100644 --- a/meson.build +++ b/meson.build @@ -260,15 +260,17 @@ executable( install_rpath : '${ORIGIN}/../' + get_option('libdir'), ) -meson.add_install_script( - python.path(), - join_paths(meson.current_source_dir(), 'build-relocatable-install.py'), - '--srcdir', meson.current_source_dir(), - '--builddir', meson.current_build_dir(), - '--relocatabledir', relocatabledir, - '--prefix', get_option('prefix'), - '--archive', meson.current_build_dir(), - '--set-version', version, -) +if get_option('relocatable') + meson.add_install_script( + python.path(), + join_paths(meson.current_source_dir(), 'build-relocatable-install.py'), + '--srcdir', meson.current_source_dir(), + '--builddir', meson.current_build_dir(), + '--relocatabledir', relocatabledir, + '--prefix', get_option('prefix'), + '--archive', meson.current_build_dir(), + '--set-version', version, + ) +endif # vim:set sw=2 sts=2 et: diff --git a/meson_options.txt b/meson_options.txt index fef87a65d198f3bfb9eb4b851a5c3c1181740bcc..78de50b9412e52acacf72d91e4dfdb7b42fb7480 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ option('python', type : 'string', value : 'python3') +option('relocatable', type : 'boolean', value : false) option('relocatabledir', type : 'string', value : 'auto') option('version', type : 'string', value : 'auto')