0004-thead.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. diff -Nur meson-0.55.1/mesonbuild/compilers/mixins/elbrus.py meson-0.55.1-fix/mesonbuild/compilers/mixins/elbrus.py
  2. --- meson-0.55.1/mesonbuild/compilers/mixins/elbrus.py 2020-08-15 16:27:05.000000000 +0000
  3. +++ meson-0.55.1-fix/mesonbuild/compilers/mixins/elbrus.py 2020-09-17 04:29:46.910396526 +0000
  4. @@ -43,6 +43,7 @@
  5. os_env = os.environ.copy()
  6. os_env['LC_ALL'] = 'C'
  7. stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=os_env)[1]
  8. + stdo = stdo.replace("lib/../lib64xthead/", "lib64xthead").replace("lp64d/../lib64xthead/", "").replace("lib64xthead/lib64xthead/", "")
  9. for line in stdo.split('\n'):
  10. if line.startswith('libraries:'):
  11. # lcc does not include '=' in --print-search-dirs output. Also it could show nonexistent dirs.
  12. @@ -54,6 +55,7 @@
  13. os_env = os.environ.copy()
  14. os_env['LC_ALL'] = 'C'
  15. stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=os_env)[1]
  16. + stdo = stdo.replace("lib/../lib64xthead/", "lib64xthead").replace("lp64d/../lib64xthead/", "").replace("lib64xthead/lib64xthead/", "")
  17. for line in stdo.split('\n'):
  18. if line.startswith('programs:'):
  19. # lcc does not include '=' in --print-search-dirs output.
  20. diff -Nur meson-0.55.1/mesonbuild/compilers/mixins/gnu.py meson-0.55.1-fix/mesonbuild/compilers/mixins/gnu.py
  21. --- meson-0.55.1/mesonbuild/compilers/mixins/gnu.py 2020-08-15 16:27:05.000000000 +0000
  22. +++ meson-0.55.1-fix/mesonbuild/compilers/mixins/gnu.py 2020-09-17 04:30:31.621394648 +0000
  23. @@ -227,7 +227,7 @@
  24. with self._build_wrapper('', env, extra_args=extra_args,
  25. dependencies=None, mode='compile',
  26. want_output=True) as p:
  27. - stdo = p.stdo
  28. + stdo = p.stdo.replace("lib/../lib64xthead/", "lib64xthead").replace("lp64d/../lib64xthead/", "").replace("lib64xthead/lib64xthead/", "")
  29. return stdo
  30. def _split_fetch_real_dirs(self, pathstr: str) -> T.List[str]:
  31. diff -Nur meson-0.55.1/mesonbuild/environment.py meson-0.55.1-fix/mesonbuild/environment.py
  32. --- meson-0.55.1/mesonbuild/environment.py 2020-09-17 04:28:27.469399864 +0000
  33. +++ meson-0.55.1-fix/mesonbuild/environment.py 2020-09-17 03:49:08.282498990 +0000
  34. @@ -1844,6 +1844,7 @@
  35. p, out, _ = Popen_safe(comp.get_exelist() + ['-print-search-dirs'])
  36. if p.returncode != 0:
  37. raise mesonlib.MesonException('Could not calculate system search dirs')
  38. + out = out.replace("lib/../lib64xthead/", "lib64xthead").replace("lp64d/../lib64xthead/", "").replace("lib64xthead/lib64xthead/", "")
  39. out = out.split('\n')[index].lstrip('libraries: =').split(':')
  40. return [os.path.normpath(p) for p in out]