diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-04 23:15:56 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-04 23:15:56 +0300 |
| commit | bb36eec84639c84ac60ff1efd4208bb7638be56d (patch) | |
| tree | 445adf46413ca9dc32e8020a519c30007ad2e0f6 | |
| parent | 3673791b4f7d8fbc290629b1173fff91d7aee781 (diff) | |
| download | meson-bb36eec84639c84ac60ff1efd4208bb7638be56d.zip meson-bb36eec84639c84ac60ff1efd4208bb7638be56d.tar.gz meson-bb36eec84639c84ac60ff1efd4208bb7638be56d.tar.bz2 | |
Strip dev rpath on install.
5 files changed, 6 insertions, 5 deletions
diff --git a/meson_install.py b/meson_install.py index 54d56a3..e42fd77 100755 --- a/meson_install.py +++ b/meson_install.py @@ -127,8 +127,9 @@ def install_targets(d): if not printed_symlink_error: print("Symlink creation does not work on this platform.") printed_symlink_error = True + install_rpath = '' if is_elf_platform(): - p = subprocess.Popen([d.depfixer, outname, d.dep_prefix], stdout=subprocess.PIPE, + p = subprocess.Popen([d.depfixer, outname, install_rpath], stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdo, stde) = p.communicate() if p.returncode != 0: diff --git a/test cases/common/46 library chain/meson.build b/test cases/common/46 library chain/meson.build index c22b9cc..77528d7 100644 --- a/test cases/common/46 library chain/meson.build +++ b/test cases/common/46 library chain/meson.build @@ -1,5 +1,5 @@ project('libchain', 'c') subdir('subdir') -e = executable('prog', 'main.c', link_with : lib1) +e = executable('prog', 'main.c', link_with : lib1, install : true) test('tst', e) diff --git a/test cases/common/46 library chain/subdir/meson.build b/test cases/common/46 library chain/subdir/meson.build index 80c6806..c165abe 100644 --- a/test cases/common/46 library chain/subdir/meson.build +++ b/test cases/common/46 library chain/subdir/meson.build @@ -1,4 +1,4 @@ subdir('subdir2') subdir('subdir3') -lib1 = shared_library('lib1', 'lib1.c', link_with : [lib2, lib3]) +lib1 = shared_library('lib1', 'lib1.c', install : true, link_with : [lib2, lib3]) diff --git a/test cases/common/46 library chain/subdir/subdir2/meson.build b/test cases/common/46 library chain/subdir/subdir2/meson.build index 178b33d..2281e4b 100644 --- a/test cases/common/46 library chain/subdir/subdir2/meson.build +++ b/test cases/common/46 library chain/subdir/subdir2/meson.build @@ -1 +1 @@ -lib2 = shared_library('lib2', 'lib2.c') +lib2 = shared_library('lib2', 'lib2.c', install : true) diff --git a/test cases/common/46 library chain/subdir/subdir3/meson.build b/test cases/common/46 library chain/subdir/subdir3/meson.build index 21f1d6e..f049c79 100644 --- a/test cases/common/46 library chain/subdir/subdir3/meson.build +++ b/test cases/common/46 library chain/subdir/subdir3/meson.build @@ -1 +1 @@ -lib3 = shared_library('lib3', 'lib3.c') +lib3 = shared_library('lib3', 'lib3.c', install : true) |