2021-12-13 01:47:19 +00:00
|
|
|
diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py
|
|
|
|
|
--- meson-0.60.2-old/mesonbuild/dependencies/boost.py 2021-11-02 16:58:07.000000000 -0300
|
|
|
|
|
+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py 2021-12-12 19:21:27.895705897 -0300
|
|
|
|
|
@@ -682,16 +682,7 @@
|
2021-12-12 21:35:10 +00:00
|
|
|
else:
|
|
|
|
|
tmp = [] # type: T.List[Path]
|
2021-12-13 01:47:19 +00:00
|
|
|
|
2021-12-12 21:35:10 +00:00
|
|
|
- # Add some default system paths
|
|
|
|
|
- tmp += [Path('/opt/local')]
|
|
|
|
|
- tmp += [Path('/usr/local/opt/boost')]
|
|
|
|
|
- tmp += [Path('/usr/local')]
|
|
|
|
|
- tmp += [Path('/usr')]
|
|
|
|
|
-
|
|
|
|
|
- # Cleanup paths
|
|
|
|
|
- tmp = [x for x in tmp if x.is_dir()]
|
|
|
|
|
- tmp = [x.resolve() for x in tmp]
|
|
|
|
|
- roots += tmp
|
2021-12-13 01:47:19 +00:00
|
|
|
+ # Remove such spurious, non-explicit "system" paths for Nix&Nixpkgs
|
2021-12-12 21:35:10 +00:00
|
|
|
|
2021-12-13 01:47:19 +00:00
|
|
|
self.check_and_set_roots(roots, use_system=True)
|
2021-12-12 21:35:10 +00:00
|
|
|
|
