chromium 136.0.7103.113: Re-add patch fixing bindgen build issue

[adalessandro]

Issue: #901
Original PR: #902

Reported in comment #901 (comment)

Commit 979d7470 ("chromium: Update to 136.0.7103.113") removed patch 0015-Revert-Connect-the-Rust-log-crate-to-the-base-loggin.patch.

However, the build issue still persists so re-add and rebase this patch on top of the new chromium release.

[adalessandro]

@otavio as detailed in the PR description, this is a missing bit from the original 136.* update PR #902

[adalessandro]

Anyone to review/merge this one?
+cc @kraj @MaxIhlenfeldt

[kraj]

This will be a pain to maintain in future.

[MaxIhlenfeldt]

Does the fix mentioned in #829 not work?

[adalessandro]

Does the fix mentioned in #829 not work?

Wasn't aware of the fix, let me check that out.

[adalessandro]

Does the fix mentioned in #829 not work?

Applied the following patch:

diff --git a/build/rust/rust_bindgen_generator.gni b/build/rust/rust_bindgen_generator.gni
index c91916be93..a86efd3291 100644
--- a/build/rust/rust_bindgen_generator.gni
+++ b/build/rust/rust_bindgen_generator.gni
@@ -215,8 +215,9 @@ template("rust_bindgen_generator") {
     # says the wrong thing. We point it to our clang's resource dir which will
     # make it behave consistently with our other command line flags and allows
     # system headers to be found.
+    clang_split_version = string_split(clang_version, ".")
     clang_resource_dir =
-        rebase_path(clang_base_path + "/lib/clang/" + clang_version,
+        rebase_path(clang_base_path + "/lib/clang/" + clang_split_version[0],
                     root_build_dir)
     args += [
       "-resource-dir",

But the error still remains:

[1337/57110] python3 ../../build/rust/run_bindgen.py --exe ../../third_party/rust-toolchain/bin/bindgen --header ../../base/logging/log_severity.h --depfile obj/base/logging_log_severity_bindgen_generator.d --output gen/base/logging_log_severity_bindgen_generator/bindings.rs --libclang-path ../../third_party/rust-toolchain/lib --ld-library-path ../../../recipe-sysroot-native/usr/lib --bindgen-flags enable-cxx-namespaces -- -x c++ -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -D__ARM_NEON__=1 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE -D_GLIBCXX_ASSERTIONS=1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -Igen -Wall -Wextra -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread-safety -Wgnu -Wno-gnu-anonymous-struct -Wno-gnu-conditional-omitted-operand -Wno-gnu-include-next -Wno-gnu-label-as-value -Wno-gnu-redeclared-enum -Wno-gnu-statement-expression -Wno-gnu-zero-variadic-macro-arguments -Wno-zero-length-array -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wloop-analysis -Wno-unneeded-internal-declaration -Wno-unknown-warning-option -Wno-cast-function-type -Wno-thread-safety-reference-return -Wno-nontrivial-memcall -Wshadow -fno-delete-null-pointer-checks -fno-strict-overflow -fno-ident -fno-strict-aliasing -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fno-sized-deallocation -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 -ffp-contract=off -flto=thin -fsplit-lto-unit -mllvm -inlinehint-threshold=360 -fwhole-program-vtables -mbranch-protection=standard -mno-outline -ffile-compilation-dir=. -Xclang --warning-suppression-mappings=../../build/config/warning_suppression.txt -ftrivial-auto-var-init=pattern -O2 -fdata-sections -ffunction-sections -fno-unique-section-names -fno-math-errno -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wno-invalid-offsetof -Wenum-compare-conditional -Wno-nullability-completeness -std=c++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -resource-dir ../../../recipe-sysroot-native/usr/lib/clang/latest -fparse-all-comments -fvisibility=default
FAILED: gen/base/logging_log_severity_bindgen_generator/bindings.rs 
python3 ../../build/rust/run_bindgen.py --exe ../../third_party/rust-toolchain/bin/bindgen --header ../../base/logging/log_severity.h --depfile obj/base/logging_log_severity_bindgen_generator.d --output gen/base/logging_log_severity_bindgen_generator/bindings.rs --libclang-path ../../third_party/rust-toolchain/lib --ld-library-path ../../../recipe-sysroot-native/usr/lib --bindgen-flags enable-cxx-namespaces -- -x c++ -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -D__ARM_NEON__=1 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE -D_GLIBCXX_ASSERTIONS=1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -Igen -Wall -Wextra -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread-safety -Wgnu -Wno-gnu-anonymous-struct -Wno-gnu-conditional-omitted-operand -Wno-gnu-include-next -Wno-gnu-label-as-value -Wno-gnu-redeclared-enum -Wno-gnu-statement-expression -Wno-gnu-zero-variadic-macro-arguments -Wno-zero-length-array -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wloop-analysis -Wno-unneeded-internal-declaration -Wno-unknown-warning-option -Wno-cast-function-type -Wno-thread-safety-reference-return -Wno-nontrivial-memcall -Wshadow -fno-delete-null-pointer-checks -fno-strict-overflow -fno-ident -fno-strict-aliasing -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fno-sized-deallocation -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 -ffp-contract=off -flto=thin -fsplit-lto-unit -mllvm -inlinehint-threshold=360 -fwhole-program-vtables -mbranch-protection=standard -mno-outline -ffile-compilation-dir=. -Xclang --warning-suppression-mappings=../../build/config/warning_suppression.txt -ftrivial-auto-var-init=pattern -O2 -fdata-sections -ffunction-sections -fno-unique-section-names -fno-math-errno -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wno-invalid-offsetof -Wenum-compare-conditional -Wno-nullability-completeness -std=c++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -resource-dir ../../../recipe-sysroot-native/usr/lib/clang/latest -fparse-all-comments -fvisibility=default
panicked at bindgen-cli/main.rs:52:36:
Unable to generate bindings: ClangDiagnostic("error: unsupported option '-mbranch-protection=' for target 'x86_64-unknown-linux-gnu'\n")
Traceback (most recent call last):
  File "/builds/mediatek/aiot/bsp/manifest/build/tmp/work/cortexa57-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release/../../build/rust/run_bindgen.py", line 118, in <module>
    main()
    ~~~~^^
  File "/builds/mediatek/aiot/bsp/manifest/build/tmp/work/cortexa57-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release/../../build/rust/run_bindgen.py", line 106, in main
    subprocess.check_call([args.exe, *genargs], env=env)
    ~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/builds/mediatek/aiot/bsp/manifest/build/tmp/work/cortexa57-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot-native/usr/lib/python3.13/subprocess.py", line 419, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['../../third_party/rust-toolchain/bin/bindgen', '--no-layout-tests', '--enable-cxx-namespaces', '--no-rustfmt-bindings', '--rust-target', 'nightly', '--depfile', '/builds/mediatek/aiot/bsp/manifest/build/tmp/work/cortexa57-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release/obj/base/tmp55hc8zy_logging_log_severity_bindgen_generator.d', '--output', 'gen/base/logging_log_severity_bindgen_generator/bindings.rs', '--no-include-path-detection', '../../base/logging/log_severity.h', '--', '-x', 'c++', '-DUSE_UDEV', '-DUSE_AURA=1', '-DUSE_GLIB=1', '-DUSE_OZONE=1', '-DOFFICIAL_BUILD', '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', '-D_FORTIFY_SOURCE=2', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE_SOURCE', '-D_LARGEFILE64_SOURCE', '-DNO_UNWIND_TABLES', '-D_GNU_SOURCE', '-D__ARM_NEON__=1', '-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE', '-D_GLIBCXX_ASSERTIONS=1', '-DNDEBUG', '-DNVALGRIND', '-DDYNAMIC_ANNOTATIONS_ENABLED=0', '-I../..', '-Igen', '-Wall', '-Wextra', '-Wimplicit-fallthrough', '-Wextra-semi', '-Wunreachable-code-aggressive', '-Wthread-safety', '-Wgnu', '-Wno-gnu-anonymous-struct', '-Wno-gnu-conditional-omitted-operand', '-Wno-gnu-include-next', '-Wno-gnu-label-as-value', '-Wno-gnu-redeclared-enum', '-Wno-gnu-statement-expression', '-Wno-gnu-zero-variadic-macro-arguments', '-Wno-zero-length-array', '-Wno-missing-field-initializers', '-Wno-unused-parameter', '-Wno-psabi', '-Wloop-analysis', '-Wno-unneeded-internal-declaration', '-Wno-unknown-warning-option', '-Wno-cast-function-type', '-Wno-thread-safety-reference-return', '-Wno-nontrivial-memcall', '-Wshadow', '-fno-delete-null-pointer-checks', '-fno-strict-overflow', '-fno-ident', '-fno-strict-aliasing', '-fstack-protector', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-fPIC', '-pthread', '-fcolor-diagnostics', '-fmerge-all-constants', '-fno-sized-deallocation', '-fcrash-diagnostics-dir=../../tools/clang/crashreports', '-mllvm', '-instcombine-lower-dbg-declare=0', '-ffp-contract=off', '-flto=thin', '-fsplit-lto-unit', '-mllvm', '-inlinehint-threshold=360', '-fwhole-program-vtables', '-mbranch-protection=standard', '-mno-outline', '-ffile-compilation-dir=.', '-ftrivial-auto-var-init=pattern', '-O2', '-fdata-sections', '-ffunction-sections', '-fno-unique-section-names', '-fno-math-errno', '-fno-omit-frame-pointer', '-g0', '-fvisibility=hidden', '-Wheader-hygiene', '-Wstring-conversion', '-Wtautological-overlap-compare', '-Wno-invalid-offsetof', '-Wenum-compare-conditional', '-Wno-nullability-completeness', '-std=c++20', '-Wno-trigraphs', '-gsimple-template-names', '-fno-exceptions', '-fno-rtti', '-fvisibility-inlines-hidden', '-resource-dir', '../../../recipe-sysroot-native/usr/lib/clang/latest', '-fparse-all-comments', '-fvisibility=default']' returned non-zero exit status 101.

[adalessandro]

@MaxIhlenfeldt another reason to have a CI building chromium targets, anything to validate the patches/workaround are correct, other than relying on the developer setup. If you get the chance to look at the issue #907 , any opinion there would help, I don't really have much time right now to implement it though, but would like to push forward to it.

[OldManYellsAtCloud]

There is also another patch mentioned by @caneraltinbasak in the same #829 issue, as part of an abandoned PR. That patch seems to directly address the -mbranch-protection= error (though don't know if it works or not).