forked from openwrt/packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This was uncovered with glib2 where the host builds were linking to the actual host instead of the generated libraries. Patch taken from buildroot. Signed-off-by: Rosen Penev <[email protected]>
- Loading branch information
Showing
2 changed files
with
35 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 | ||
From: Eric Le Bihan <[email protected]> | ||
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 <[email protected]> | ||
[Fix: remove leftover from original/unconditional code] | ||
Signed-off-by: Peter Seiderer <[email protected]> | ||
--- | ||
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 | ||
|