From cb1470833150727f2d46ca4455d420c9d09a151a Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 8 Jan 2024 10:25:26 -0500 Subject: [PATCH] test: add rpath post-install --- configure.py | 6 ++++++ examples/meson.build | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index b45f15b49..b90ca3437 100755 --- a/configure.py +++ b/configure.py @@ -97,6 +97,12 @@ def meson_string_array(arr): meson setup --native-file {args.ini} {args.build} {sourceDir} meson install -C {args.build} ''')) + for rpath in pkg_config_path: + fp.write(textwrap.dedent(f'''\ + for exe in iguana-example-00-basic iguana-example-01-bank-rows; do + install_name_tool -add_rpath {rpath}/.. iguana/bin/$exe + done + ''')) os.chmod(installScript, 0o744) print(f''' Generated installation script {installScript} diff --git a/examples/meson.build b/examples/meson.build index 243cb9398..e845ab555 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -4,11 +4,11 @@ example_sources = [ ] # add iguana libraries to rpath -example_rpaths = [] -example_rpaths += hipo_dep.get_variable(pkgconfig: 'libdir') -if host_machine.system() != 'darwin' - example_rpaths += '$ORIGIN' / '..' / get_option('libdir') -endif +# example_rpaths = [] +# example_rpaths += hipo_dep.get_variable(pkgconfig: 'libdir') +# if host_machine.system() != 'darwin' +# example_rpaths += '$ORIGIN' / '..' / get_option('libdir') +# endif # build executables foreach src : example_sources @@ -19,6 +19,6 @@ foreach src : example_sources dependencies: project_deps, link_with: project_libs, install: true, - install_rpath: ':'.join(example_rpaths), + # install_rpath: ':'.join(example_rpaths), ) endforeach