diff options
-rw-r--r-- | meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb (renamed from meta-oe/recipes-devtools/breakpad/breakpad_git.bb) | 11 |
2 files changed, 35 insertions, 7 deletions
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..943daf4d00 --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 45ea097e864e566771d756c92619e984815acd1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Nathan Moinvaziri <nathan@nathanm.com> | ||
3 | Date: Tue, 19 Dec 2023 14:35:05 -0800 | ||
4 | Subject: [PATCH] Fixed missing include for std::find_if. | ||
5 | |||
6 | Throws an error when compiling on Windows. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d] | ||
9 | Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 | ||
10 | Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 | ||
11 | Reviewed-by: Ivan Penkov <ivanpe@chromium.org> | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | src/common/module.cc | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/src/common/module.cc b/src/common/module.cc | ||
18 | index 0eb5aad8..b6f5da7e 100644 | ||
19 | --- a/src/common/module.cc | ||
20 | +++ b/src/common/module.cc | ||
21 | @@ -42,6 +42,7 @@ | ||
22 | #include <stdio.h> | ||
23 | #include <string.h> | ||
24 | |||
25 | +#include <algorithm> | ||
26 | #include <functional> | ||
27 | #include <iostream> | ||
28 | #include <memory> | ||
29 | -- | ||
30 | 2.43.0 | ||
31 | |||
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb index 3462b846d3..3bf4371e85 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb | |||
@@ -18,22 +18,18 @@ BBCLASSEXTEND = "native" | |||
18 | 18 | ||
19 | PE = "2" | 19 | PE = "2" |
20 | 20 | ||
21 | PV = "1.0" | 21 | SRCREV_FORMAT = "breakpad_gtest_protobuf_lss" |
22 | 22 | ||
23 | SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" | 23 | SRCREV_breakpad = "8988364bcddd9b194b0bf931c10bc125987330ed" |
24 | 24 | #v1.11.0 | |
25 | SRCREV_breakpad = "7a1a190f4f68e8a3e06788498f50a4d5520a69f3" | ||
26 | #v1.10.0 | ||
27 | SRCREV_gtest = "e2239ee6043f73722e7aa812a459f54a28552929" | 25 | SRCREV_gtest = "e2239ee6043f73722e7aa812a459f54a28552929" |
28 | SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" | 26 | SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" |
29 | SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31" | 27 | SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31" |
30 | SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" | ||
31 | 28 | ||
32 | SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ | 29 | SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ |
33 | git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \ | 30 | git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \ |
34 | git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \ | 31 | git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \ |
35 | git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ | 32 | git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ |
36 | git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp;branch=master \ | ||
37 | file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ | 33 | file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ |
38 | file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ | 34 | file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ |
39 | file://0001-Turn-off-sign-compare-for-musl-libc.patch \ | 35 | file://0001-Turn-off-sign-compare-for-musl-libc.patch \ |
@@ -41,6 +37,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h | |||
41 | file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ | 37 | file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ |
42 | file://mcontext.patch \ | 38 | file://mcontext.patch \ |
43 | file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ | 39 | file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ |
40 | file://0001-Fixed-missing-include-for-std-find_if.patch \ | ||
44 | file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ | 41 | file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ |
45 | file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ | 42 | file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ |
46 | " | 43 | " |