You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.5 KiB
34 lines
1.5 KiB
From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001
|
|
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
|
Date: Sat, 14 Jul 2018 11:18:45 +0200
|
|
Subject: [PATCH] Only fix RPATH if install_rpath is not empty
|
|
|
|
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
|
[Fix: remove leftover from original/unconditional code]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
mesonbuild/minstall.py | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
|
|
index 8ac6aab1..7ef04116 100644
|
|
--- a/mesonbuild/minstall.py
|
|
+++ b/mesonbuild/minstall.py
|
|
@@ -508,8 +508,14 @@ class Installer:
|
|
if file_copied:
|
|
self.did_install_something = True
|
|
try:
|
|
- depfixer.fix_rpath(outname, install_rpath, final_path,
|
|
- install_name_mappings, verbose=False)
|
|
+ # Buildroot check-host-rpath script expects RPATH
|
|
+ # But if install_rpath is empty, it will stripped.
|
|
+ # So, preserve it in this case
|
|
+ if install_rpath:
|
|
+ depfixer.fix_rpath(outname, install_rpath, final_path,
|
|
+ install_name_mappings, verbose=False)
|
|
+ else:
|
|
+ print("Skipping RPATH fixing")
|
|
except SystemExit as e:
|
|
if isinstance(e.code, int) and e.code == 0:
|
|
pass
|
|
|