firefox-riscv64-hack.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102
  1. Temporary hack to allow us to directly apply diff of matoko's branch. Disable
  2. rust-vet to skip auditing third party libs in order to download/vendor rust
  3. deps on non-git firefox src. Skip some style checks, as
  4. macroassembler support in js/src/jit/ is not complete yet
  5. diff --git a/python/mozbuild/mozbuild/vendor/vendor_rust.py b/python/mozbuild/mozbuild/vendor/vendor_rust.py
  6. index 7394ccaf40..491bd7fbdb 100644
  7. --- a/python/mozbuild/mozbuild/vendor/vendor_rust.py
  8. +++ b/python/mozbuild/mozbuild/vendor/vendor_rust.py
  9. @@ -740,38 +740,40 @@ license file's hash.
  10. failed = True
  11. # Only emit warnings for cargo-vet for now.
  12. - env = os.environ.copy()
  13. - env["PATH"] = os.pathsep.join(
  14. - (
  15. - str(Path(cargo).parent),
  16. - os.environ["PATH"],
  17. - )
  18. - )
  19. - flags = ["--output-format=json"]
  20. - if "MOZ_AUTOMATION" in os.environ:
  21. - flags.append("--locked")
  22. - flags.append("--frozen")
  23. - res = cargo_vet(
  24. - self,
  25. - flags,
  26. - stdout=subprocess.PIPE,
  27. - env=env,
  28. - )
  29. - if res.returncode:
  30. - vet = json.loads(res.stdout)
  31. - for failure in vet.get("failures", []):
  32. - failure["crate"] = failure.pop("name")
  33. - self.log(
  34. - logging.ERROR,
  35. - "cargo_vet_failed",
  36. - failure,
  37. - "Missing audit for {crate}:{version} (requires {missing_criteria})."
  38. - " Run `./mach cargo vet` for more information.",
  39. - )
  40. - failed = True
  41. -
  42. - if failed:
  43. - return False
  44. + #env = os.environ.copy()
  45. + #env["PATH"] = os.pathsep.join(
  46. + # (
  47. + # str(Path(cargo).parent),
  48. + # os.environ["PATH"],
  49. + # )
  50. + #)
  51. + #print(env["PATH"])
  52. + #print(self.topsrcdir)
  53. + #flags = ["--output-format=json"]
  54. + #if "MOZ_AUTOMATION" in os.environ:
  55. + # flags.append("--locked")
  56. + # flags.append("--frozen")
  57. + #res = cargo_vet(
  58. + # self,
  59. + # flags,
  60. + # stdout=subprocess.PIPE,
  61. + # env=env,
  62. + #)
  63. + #if res.returncode:
  64. + # vet = json.loads(res.stdout)
  65. + # for failure in vet.get("failures", []):
  66. + # failure["crate"] = failure.pop("name")
  67. + # self.log(
  68. + # logging.ERROR,
  69. + # "cargo_vet_failed",
  70. + # failure,
  71. + # "Missing audit for {crate}:{version} (requires {missing_criteria})."
  72. + # " Run `./mach cargo vet` for more information.",
  73. + # )
  74. + # failed = True
  75. +
  76. + #if failed:
  77. + # return False
  78. res = subprocess.run(
  79. [cargo, "vendor", vendor_dir], cwd=self.topsrcdir, stdout=subprocess.PIPE
  80. @@ -848,6 +848,7 @@ license file's hash.
  81. directory=replace["directory"],
  82. )
  83. )
  84. + return True
  85. if not self._check_licenses(vendor_dir):
  86. self.log(
  87. diff --git a/js/src/build/moz.build b/js/src/build/moz.build
  88. index 4c48a5c4ff..e68d79447e 100644
  89. --- a/js/src/build/moz.build
  90. +++ b/js/src/build/moz.build
  91. @@ -101,7 +101,5 @@ GeneratedFile(
  92. inputs=[
  93. "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
  94. - "/config/check_spidermonkey_style.py",
  95. - "/config/check_macroassembler_style.py",
  96. "/config/check_js_opcode.py",
  97. ],
  98. )