diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-18 13:06:07 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-19 07:00:18 +0100 |
| commit | 691ef41f01f42f877d3f1d9bfd5b2e09585dd8b4 (patch) | |
| tree | e94bb708556024dbd037043f1d905d5a293d1114 /patches | |
| parent | 6b61731f19028cd0e2ce6d7cbc8720721d72341b (diff) | |
| download | ptxdist-691ef41f01f42f877d3f1d9bfd5b2e09585dd8b4.tar.gz ptxdist-691ef41f01f42f877d3f1d9bfd5b2e09585dd8b4.tar.xz | |
host-meson: don't loose rpaths host packages
gtk fails to build without this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/meson-0.49.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch | 44 | ||||
| -rw-r--r-- | patches/meson-0.49.2/series | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/patches/meson-0.49.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch b/patches/meson-0.49.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch new file mode 100644 index 000000000..054e28daf --- /dev/null +++ b/patches/meson-0.49.2/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 4040251373a1..29e4612829a9 100644 +--- a/mesonbuild/backend/backends.py ++++ b/mesonbuild/backend/backends.py +@@ -999,9 +999,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 t.is_cross: ++ 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) + # On toolchains/platforms that use an import library for + # linking (separate from the shared library with all the +diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py +index 8ac6aab1d9a0..f55708e06836 100644 +--- a/mesonbuild/minstall.py ++++ b/mesonbuild/minstall.py +@@ -476,7 +476,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) diff --git a/patches/meson-0.49.2/series b/patches/meson-0.49.2/series index 60429c13d..119016a64 100644 --- a/patches/meson-0.49.2/series +++ b/patches/meson-0.49.2/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch 0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch -# 64a38f30e6d78c37e38a2d143fa8ed71 - git-ptx-patches magic +0003-HACK-don-t-loose-the-rpath-for-host-packages.patch +# 5cb122e1f6a7d12f6e2fc7dd5a2d329b - git-ptx-patches magic |