diff options
| author | Marius Bakke <[email protected]> | 2017-09-20 18:49:26 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2017-09-20 18:49:26 +0200 |
| commit | 58366883f2f1516a4a02f5b4e2a70e86481827b5 (patch) | |
| tree | fa67d714c4596164b341118132728a48135f4759 /gnu/packages/patches/meson-for-build-rpath.patch | |
| parent | f40aef6b3b56e1e5fb6e6ac29bd372000e13982f (diff) | |
| parent | 9a1c4a981bdd7eeca76aaf73a57d6841918821c2 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/meson-for-build-rpath.patch')
| -rw-r--r-- | gnu/packages/patches/meson-for-build-rpath.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/meson-for-build-rpath.patch b/gnu/packages/patches/meson-for-build-rpath.patch new file mode 100644 index 0000000000..4e20c9aed3 --- /dev/null +++ b/gnu/packages/patches/meson-for-build-rpath.patch @@ -0,0 +1,24 @@ +This patch removes a part of meson that clears the rpath upon installation. +This will only be applied to a special version of meson, used for the +meson-build-system. + +Patch by Peter Mikkelsen <[email protected]> + +--- meson-0.42.0/mesonbuild/scripts/meson_install.py.orig 2017-09-09 01:49:39.147374148 +0200 ++++ meson-0.42.0/mesonbuild/scripts/meson_install.py 2017-09-09 01:51:01.209134717 +0200 +@@ -345,15 +345,6 @@ + print("Symlink creation does not work on this platform. " + "Skipping all symlinking.") + printed_symlink_error = True +- if is_elf_platform() and os.path.isfile(outname): +- try: +- e = depfixer.Elf(outname, False) +- e.fix_rpath(install_rpath) +- except SystemExit as e: +- if isinstance(e.code, int) and e.code == 0: +- pass +- else: +- raise + + def run(args): + global install_log_file |