diff options
Diffstat (limited to 'patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch')
| -rw-r--r-- | patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch b/patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch new file mode 100644 index 000000000..ed84af3b6 --- /dev/null +++ b/patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch @@ -0,0 +1,44 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 18 Mar 2019 13:04:32 +0100 +Subject: [PATCH] HACK: don't loose the rpath for host packages + +Needed by ptxdist to run tools in sysroot-host + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + mesonbuild/backend/backends.py | 6 +++++- + mesonbuild/minstall.py | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py +index 2a07058a62f8..60708cafeacc 100644 +--- a/mesonbuild/backend/backends.py ++++ b/mesonbuild/backend/backends.py +@@ -1088,9 +1088,13 @@ class Backend: + # Done separately because of strip/aliases/rpath + if outdirs[0] is not False: + mappings = t.get_link_deps_mapping(d.prefix, self.environment) ++ if not t.install_rpath and not self.environment.is_cross_build(): ++ install_rpath = None ++ else: ++ install_rpath = t.install_rpath + i = TargetInstallData(self.get_target_filename(t), outdirs[0], + t.get_aliases(), should_strip, mappings, +- t.install_rpath, install_mode) ++ install_rpath, install_mode) + d.targets.append(i) + + if isinstance(t, (build.SharedLibrary, build.SharedModule, build.Executable)): +diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py +index b1a55e5a78f0..541068b49f51 100644 +--- a/mesonbuild/minstall.py ++++ b/mesonbuild/minstall.py +@@ -487,7 +487,7 @@ class Installer: + print("Symlink creation does not work on this platform. " + "Skipping all symlinking.") + printed_symlink_error = True +- if os.path.isfile(outname): ++ if os.path.isfile(outname) and install_rpath is not None: + try: + depfixer.fix_rpath(outname, install_rpath, final_path, + install_name_mappings, verbose=False) |