From c1c86485ffce0db69aedac6d1e3c0deec65267f4 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 29 Jun 2022 07:30:11 +0900 Subject: [PATCH] Work around build failure with newer cbindgen. bz#1773259 Gbp-Pq: Topic debian-hacks Gbp-Pq: Name Work-around-build-failure-with-newer-cbindgen.-bz-17.patch --- build/moz.configure/bindgen.configure | 9 +++++++++ gfx/webrender_bindings/webrender_ffi.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/build/moz.configure/bindgen.configure b/build/moz.configure/bindgen.configure index 73e590a397e..3679fddbaec 100644 --- a/build/moz.configure/bindgen.configure +++ b/build/moz.configure/bindgen.configure @@ -91,6 +91,15 @@ def cbindgen(cbindgen_override, bootstrap_search_path, rust_search_path): set_config("CBINDGEN", cbindgen) +set_define( + "CBINDGEN_0_24", + True, + when=depends(cbindgen)( + lambda c: Version(check_cmd_output(c, "--version").strip().split(" ")[1]) + >= "0.24.0" + ), +) + # Bindgen can use rustfmt to format Rust file, but it's not required. option(env="RUSTFMT", nargs=1, help="Path to the rustfmt program") diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h index b68b691b6e9..e8378244b51 100644 --- a/gfx/webrender_bindings/webrender_ffi.h +++ b/gfx/webrender_bindings/webrender_ffi.h @@ -77,7 +77,9 @@ struct WrPipelineInfo; struct WrPipelineIdAndEpoch; using WrPipelineIdEpochs = nsTArray; +#ifndef CBINDGEN_0_24 const uint64_t ROOT_CLIP_CHAIN = ~0; +#endif } // namespace wr } // namespace mozilla -- 2.30.2