From 964937790b3616e25750c9b610ea8eb5643fb0fe Mon Sep 17 00:00:00 2001 From: artem-ogre Date: Wed, 29 Jan 2025 13:59:29 +0100 Subject: [PATCH] #17954 Fix breakpad compilation with gcc-13 --- recipes/breakpad/all/conandata.yml | 1 + .../patches/0004-Fix-gcc13-compilation.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch diff --git a/recipes/breakpad/all/conandata.yml b/recipes/breakpad/all/conandata.yml index da051fdc78d51..08d93843ceaf8 100644 --- a/recipes/breakpad/all/conandata.yml +++ b/recipes/breakpad/all/conandata.yml @@ -7,3 +7,4 @@ patches: - patch_file: "patches/0001-Use_conans_lss.patch" - patch_file: "patches/0002-Remove-hardcoded-fpic.patch" - patch_file: "patches/0003-Fix-gcc11-compilation.patch" + - patch_file: "patches/0004-Fix-gcc13-compilation.patch" diff --git a/recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch b/recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch new file mode 100644 index 0000000000000..d3520b999c9c5 --- /dev/null +++ b/recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch @@ -0,0 +1,20 @@ +--- a/src/client/linux/handler/minidump_descriptor.h ++++ b/src/client/linux/handler/minidump_descriptor.h +@@ -30,6 +30,7 @@ + #ifndef CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ + #define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ + ++#include + #include + #include + +--- a/src/processor/exploitability_linux.cc ++++ b/src/processor/exploitability_linux.cc +@@ -516,7 +516,6 @@ + raw_bytes_tmpfile); + FILE* objdump_fp = popen(cmd, "r"); + if (!objdump_fp) { +- fclose(objdump_fp); + unlink(raw_bytes_tmpfile); + BPLOG(ERROR) << "Failed to call objdump."; + return false;