nixpkgs/pkgs/by-name/me/meson/001-fix-rpath.patch

--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -723,6 +723,21 @@
     @staticmethod
     def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:
         dirs: T.Set[str] = set()
+
+        nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
+        next_is_path = False
+        # Try to add rpaths set by user or ld-wrapper so that they are not removed.
+        # Based on https://github.com/NixOS/nixpkgs/blob/69711a2f5ffe8cda208163be5258266172ff527f/pkgs/build-support/bintools-wrapper/ld-wrapper.sh#L148-L177
+        for flag in nix_ldflags:
+            if flag == '-rpath' or flag == '-L':
+                next_is_path = True
+            elif next_is_path or flag.startswith('-L/'):
+                if flag.startswith('-L/'):
+                    flag = flag[2:]
+                if flag.startswith('@storeDir@'):
+                    dirs.add(flag)
+                next_is_path = False
+
         # Match rpath formats:
         # -Wl,-rpath=
         # -Wl,-rpath,
meson: 0.54.2 → 0.55.0 https://mesonbuild.com/Release-notes-for-0-55-0.html https://github.com/mesonbuild/meson/releases/tag/0.55.0 https://github.com/mesonbuild/meson/compare/0.54.2...0.55.0 2020-07-12 18:19:10 +02:00			`--- a/mesonbuild/backend/backends.py`
			`+++ b/mesonbuild/backend/backends.py`
meson: 0.60.3 -> 0.61.2 2022-01-13 02:59:40 +01:00			`@@ -723,6 +723,21 @@`
			`@staticmethod`
			`def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:`
			`dirs: T.Set[str] = set()`
meson: fix rpath fixup In common distributions, RPATH is only needed for internal libraries so meson removes everything else. With Nix, the locations of libraries are not as predictable, therefore we need to keep them in the RPATH. [1] Previously we have just kept the RPATH produced by the linker, patching meson not to remove it. This deprived us of potentially replacing it with install_rpath provided by project so we had to re-add it manually, and also introduced a vulnerability of keeping build paths in RPATH. This commit restores the clean-up but modifies it so the items starting with /nix/store are retained. This should be relatively safe since the store is immutable, however, there might be some unwanted retainment of build_rpath [2] if it contains paths from Nix store. [1]: https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 [2]: http://mesonbuild.com/Release-notes-for-0-42-0.html#added-build_rpath-keyword-argument 2018-02-23 01:42:35 +01:00			`+`
meson: 0.54.2 → 0.55.0 https://mesonbuild.com/Release-notes-for-0-55-0.html https://github.com/mesonbuild/meson/releases/tag/0.55.0 https://github.com/mesonbuild/meson/compare/0.54.2...0.55.0 2020-07-12 18:19:10 +02:00			`+ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()`
			`+ next_is_path = False`
			`+ # Try to add rpaths set by user or ld-wrapper so that they are not removed.`
			`+ # Based on https://github.com/NixOS/nixpkgs/blob/69711a2f5ffe8cda208163be5258266172ff527f/pkgs/build-support/bintools-wrapper/ld-wrapper.sh#L148-L177`
			`+ for flag in nix_ldflags:`
			`+ if flag == '-rpath' or flag == '-L':`
			`+ next_is_path = True`
			`+ elif next_is_path or flag.startswith('-L/'):`
			`+ if flag.startswith('-L/'):`
			`+ flag = flag[2:]`
			`+ if flag.startswith('@storeDir@'):`
			`+ dirs.add(flag)`
			`+ next_is_path = False`
meson: fix rpath fixup In common distributions, RPATH is only needed for internal libraries so meson removes everything else. With Nix, the locations of libraries are not as predictable, therefore we need to keep them in the RPATH. [1] Previously we have just kept the RPATH produced by the linker, patching meson not to remove it. This deprived us of potentially replacing it with install_rpath provided by project so we had to re-add it manually, and also introduced a vulnerability of keeping build paths in RPATH. This commit restores the clean-up but modifies it so the items starting with /nix/store are retained. This should be relatively safe since the store is immutable, however, there might be some unwanted retainment of build_rpath [2] if it contains paths from Nix store. [1]: https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 [2]: http://mesonbuild.com/Release-notes-for-0-42-0.html#added-build_rpath-keyword-argument 2018-02-23 01:42:35 +01:00			`+`
meson: 0.55.0 → 0.55.1 https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1 setuptools have been removed from runtime dependencies: https://github.com/mesonbuild/meson/pull/7461 2020-08-16 02:02:05 +02:00			`# Match rpath formats:`
			`# -Wl,-rpath=`
			`# -Wl,-rpath,`