* [gentoo-commits] repo/gentoo:master commit in: dev-util/breakpad/, dev-util/breakpad/files/
@ 2023-03-11 7:58 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-03-11 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 30338cce2bd18f35a1ab8d31a60285b7f79a3a66
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 07:56:18 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 07:57:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30338cce
dev-util/breakpad: fix for gcc13, remove old
Closes: https://bugs.gentoo.org/898576
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-util/breakpad/Manifest | 1 -
dev-util/breakpad/breakpad-2022.06.04.ebuild | 59 ----------------------
dev-util/breakpad/breakpad-2022.07.12.ebuild | 1 +
.../breakpad/files/breakpad-2022.06.04-test.patch | 49 ------------------
.../breakpad/files/breakpad-2022.07.12-gcc13.patch | 10 ++++
5 files changed, 11 insertions(+), 109 deletions(-)
diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index c40a261b2261..b17d5765b09e 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1,2 +1 @@
-DIST breakpad-2022.06.04.tar.gz 5365322 BLAKE2B eec33092a9a75161d16554af22276195945f3e1c7ce9590f89010a4d11484fe4327849c1717e159a9e019ca44d437b601b7080c68bba8c95111b97d6662dfc3f SHA512 150e5e955dc9de55d5cb4c726ae6f1a2e79e9f7bb283bae2ba835b684e7fd7532a7070e9ba982b66b68c936592bc48550a22ed8ac40e829b11aa80530f338749
DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
diff --git a/dev-util/breakpad/breakpad-2022.06.04.ebuild b/dev-util/breakpad/breakpad-2022.06.04.ebuild
deleted file mode 100644
index 66912e949d83..000000000000
--- a/dev-util/breakpad/breakpad-2022.06.04.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-CommitId=41a11409d6ba04e308adc66f5a33115e2d7c9174
-DESCRIPTION="implement a crash-reporting system."
-HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/"
-SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
- net-misc/curl
-"
-DEPEND="${RDEPEND}
- dev-libs/linux-syscall-support
- dev-embedded/libdisasm
-"
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
- "${FILESDIR}"/${P}-test.patch
- "${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
- default
- sed -i \
- -e 's|"third_party/lss\(.*\)"|<lss\1>|' \
- $(find src -name '*.cc' -o -name '*.h') \
- || die
- sed -i \
- -e '/includelss/d' \
- -e '/third_party\/curl/d' \
- Makefile.am \
- || die
- sed -i \
- -e "/AC_INIT/s:0.1:${PVR}:" \
- -e "/AS_VAR_APPEND/d" \
- configure.ac \
- || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-system-test-libs \
- || die
-}
diff --git a/dev-util/breakpad/breakpad-2022.07.12.ebuild b/dev-util/breakpad/breakpad-2022.07.12.ebuild
index 5fb691383145..eac86e3033e5 100644
--- a/dev-util/breakpad/breakpad-2022.07.12.ebuild
+++ b/dev-util/breakpad/breakpad-2022.07.12.ebuild
@@ -26,6 +26,7 @@ BDEPEND="test? ( dev-cpp/gtest )"
RESTRICT="!test? ( test )"
PATCHES=(
+ "${FILESDIR}"/${P}-gcc13.patch
"${FILESDIR}"/${PN}-2022.06.04-gentoo.patch
)
diff --git a/dev-util/breakpad/files/breakpad-2022.06.04-test.patch b/dev-util/breakpad/files/breakpad-2022.06.04-test.patch
deleted file mode 100644
index 7bf1d78290ab..000000000000
--- a/dev-util/breakpad/files/breakpad-2022.06.04-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/common/dwarf_cu_to_module_unittest.cc 2022-06-06 21:31:46.537946012 +0200
-+++ b/src/common/dwarf_cu_to_module_unittest.cc 2022-06-06 21:33:27.299716909 +0200
-@@ -780,7 +780,7 @@
- 0x2805c4531be6ca0eULL, 0x686b52155a8d4d2cULL);
- }
-
--TEST_F(SimpleCU, UnknownAbstractOrigin) {
-+TEST_F(SimpleCU, DISABLED_UnknownAbstractOrigin) {
- EXPECT_CALL(reporter_, UnknownAbstractOrigin(_, 1ULL)).WillOnce(Return());
- EXPECT_CALL(reporter_, UnnamedFunction(0x11c70f94c6e87ccdLL))
- .WillOnce(Return());
-@@ -798,7 +798,7 @@
- 0x1758a0f941b71efbULL, 0x1cf154f1f545e146ULL);
- }
-
--TEST_F(SimpleCU, UnnamedFunction) {
-+TEST_F(SimpleCU, DISABLED_UnnamedFunction) {
- EXPECT_CALL(reporter_, UnnamedFunction(0xe34797c7e68590a8LL))
- .WillOnce(Return());
- PushLine(0x72b80e41a0ac1d40ULL, 0x537174f231ee181cULL, "line-file", 14044850);
-@@ -1573,7 +1573,7 @@
- EXPECT_STREQ("class_A::member_func_B", functions[0]->name.str().c_str());
- }
-
--TEST_F(Specifications, UnhandledInterCU) {
-+TEST_F(Specifications, DISABLED_UnhandledInterCU) {
- Module m("module-name", "module-os", "module-arch", "module-id");
- DwarfCUToModule::FileContext fc("dwarf-filename", &m, false);
- EXPECT_CALL(reporter_, UncoveredFunction(_)).WillOnce(Return());
-@@ -1630,7 +1630,7 @@
- }
- }
-
--TEST_F(Specifications, BadOffset) {
-+TEST_F(Specifications, DISABLED_BadOffset) {
- PushLine(0xa0277efd7ce83771ULL, 0x149554a184c730c1ULL, "line-file", 56636272);
- EXPECT_CALL(reporter_, UnknownSpecification(_, 0x2be953efa6f9a996ULL))
- .WillOnce(Return());
---- a/src/common/module_unittest.cc 2022-06-06 21:33:46.167486242 +0200
-+++ b/src/common/module_unittest.cc 2022-06-06 21:34:02.480286684 +0200
-@@ -427,7 +427,7 @@
- contents.c_str());
- }
-
--TEST(Construct, FunctionsWithSameAddress) {
-+TEST(Construct, DISABLED_FunctionsWithSameAddress) {
- stringstream s;
- Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
-
diff --git a/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch b/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch
new file mode 100644
index 000000000000..9f989bf2907a
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/src/client/linux/handler/minidump_descriptor.h 2023-03-11 08:49:06.385815254 +0100
++++ b/src/client/linux/handler/minidump_descriptor.h 2023-03-11 08:49:42.758139412 +0100
+@@ -33,6 +33,7 @@
+ #include <assert.h>
+ #include <sys/types.h>
+
++#include <cstdint>
+ #include <string>
+
+ #include "client/linux/handler/microdump_extra_info.h"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/breakpad/, dev-util/breakpad/files/
@ 2023-10-29 20:40 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-10-29 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 891282ee23ea491f4212b9b4ccb95a807205af99
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 20:39:28 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 20:39:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891282ee
dev-util/breakpad: add 2023.01.27
Closes: https://bugs.gentoo.org/916215
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-util/breakpad/Manifest | 1 +
dev-util/breakpad/breakpad-2023.01.27.ebuild | 55 ++++++++++
.../files/breakpad-2023.01.27-gentoo.patch | 119 +++++++++++++++++++++
3 files changed, 175 insertions(+)
diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index b17d5765b09e..71ea12e876ac 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1 +1,2 @@
DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
+DIST breakpad-2023.01.27.tar.gz 5455242 BLAKE2B 650f9c2ff4ee5e50f9d51573706757cc56a4d64171a5aea7b825327c55b05b9122d375e718951eee26c2bde7aae69d385205fa777fa23e61e5c97683f3c76120 SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4
diff --git a/dev-util/breakpad/breakpad-2023.01.27.ebuild b/dev-util/breakpad/breakpad-2023.01.27.ebuild
new file mode 100644
index 000000000000..398f79e86f23
--- /dev/null
+++ b/dev-util/breakpad/breakpad-2023.01.27.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="implement a crash-reporting system."
+HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-4"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ net-misc/curl
+"
+DEPEND="${RDEPEND}
+ dev-libs/linux-syscall-support
+ dev-embedded/libdisasm
+"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+ default
+ sed -i \
+ -e 's|"third_party/lss\(.*\)"|<lss\1>|' \
+ $(find src -name '*.cc' -o -name '*.h') \
+ || die
+ sed -i \
+ -e '/includelss/d' \
+ -e '/third_party\/curl/d' \
+ Makefile.am \
+ || die
+ sed -i \
+ -e "/AC_INIT/s:0.1:${PVR}:" \
+ -e "/AS_VAR_APPEND/d" \
+ configure.ac \
+ || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-system-test-libs \
+ || die
+}
diff --git a/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch b/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch
new file mode 100644
index 000000000000..83a4e824c970
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch
@@ -0,0 +1,119 @@
+--- a/src/common/linux/libcurl_wrapper.h 2022-06-07 21:55:00.387396660 +0200
++++ b/src/common/linux/libcurl_wrapper.h 2022-06-07 21:55:18.450145751 +0200
+@@ -36,7 +36,7 @@
+ #include <map>
+
+ #include "common/using_std_string.h"
+-#include "third_party/curl/curl.h"
++#include <curl/curl.h>
+
+ namespace google_breakpad {
+
+--- a/src/common/linux/http_upload.cc 2022-06-07 21:53:55.505298529 +0200
++++ b/src/common/linux/http_upload.cc 2022-06-07 21:54:17.944986506 +0200
+@@ -30,7 +30,7 @@
+
+ #include <assert.h>
+ #include <dlfcn.h>
+-#include "third_party/curl/curl.h"
++#include <curl/curl.h>
+
+ namespace {
+
+--- a/src/processor/disassembler_x86.h 2022-06-08 08:41:45.569686249 +0200
++++ b/src/processor/disassembler_x86.h 2022-06-08 08:42:09.049377873 +0200
+@@ -42,7 +42,7 @@
+ #include "google_breakpad/common/breakpad_types.h"
+
+ namespace libdis {
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+ }
+
+ namespace google_breakpad {
+--- a/Makefile.am 2022-06-08 08:51:35.221948155 +0200
++++ b/Makefile.am 2022-06-08 08:53:21.679551745 +0200
+@@ -176,7 +176,6 @@
+
+ lib_LIBRARIES += src/libbreakpad.a
+ pkgconfig_DATA += breakpad.pc
+-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
+
+ ## Programs
+ bin_PROGRAMS += \
+@@ -944,7 +943,7 @@
+ src/processor/stackwalker_x86.o \
+ src/processor/symbolic_constants_win.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+@@ -967,7 +966,7 @@
+ $(AM_CPPFLAGS) $(TEST_CFLAGS)
+ src_processor_disassembler_x86_unittest_LDADD = \
+ src/processor/disassembler_x86.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+@@ -1074,7 +1073,7 @@
+ src/processor/stackwalker_x86.o \
+ src/processor/symbolic_constants_win.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+@@ -1104,7 +1103,7 @@
+ src_processor_proc_maps_linux_unittest_LDADD = \
+ src/processor/logging.o \
+ src/processor/pathname_stripper.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+@@ -1405,7 +1404,7 @@
+ src/processor/stackwalker_sparc.o \
+ src/processor/stackwalker_x86.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a
++ -ldisasm
+
+ src_processor_minidump_stackwalk_SOURCES = \
+ src/processor/minidump_stackwalk.cc
+@@ -1448,7 +1448,7 @@
+ src/processor/stackwalker_x86.o \
+ src/processor/symbolic_constants_win.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a
++ -ldisasm
+
+ ## Additional files to be included in a source distribution
+ ##
+--- a/src/processor/exploitability_win.cc 2022-06-08 08:59:44.437471336 +0200
++++ b/src/processor/exploitability_win.cc 2022-06-08 09:00:04.061210421 +0200
+@@ -43,7 +43,7 @@
+ #include "processor/disassembler_x86.h"
+ #include "processor/logging.h"
+
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+
+ namespace google_breakpad {
+
+--- a/src/processor/disassembler_x86_unittest.cc 2022-06-08 10:30:23.370615114 +0200
++++ b/src/processor/disassembler_x86_unittest.cc 2022-06-08 10:30:44.003341412 +0200
+@@ -30,7 +30,7 @@
+
+ #include "breakpad_googletest_includes.h"
+ #include "processor/disassembler_x86.h"
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+
+ namespace {
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/breakpad/, dev-util/breakpad/files/
@ 2024-09-20 21:02 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2024-09-20 21:02 UTC (permalink / raw
To: gentoo-commits
commit: ab3e1e5cf5323e532343b21bed571b4e5618e4fd
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 21:00:48 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 21:01:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3e1e5c
dev-util/breakpad: bump to 2023.06.01 and fix musl build
Closes: https://bugs.gentoo.org/936393
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-util/breakpad/Manifest | 1 +
dev-util/breakpad/breakpad-2023.01.27.ebuild | 4 +
...023.01.27.ebuild => breakpad-2023.06.01.ebuild} | 4 +
.../files/breakpad-2023.06.01-gentoo.patch | 129 +++++++++++++++++++++
4 files changed, 138 insertions(+)
diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index 71ea12e876ac..9473c897f098 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1,2 +1,3 @@
DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
DIST breakpad-2023.01.27.tar.gz 5455242 BLAKE2B 650f9c2ff4ee5e50f9d51573706757cc56a4d64171a5aea7b825327c55b05b9122d375e718951eee26c2bde7aae69d385205fa777fa23e61e5c97683f3c76120 SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4
+DIST breakpad-2023.06.01.tar.gz 5472205 BLAKE2B c1cb70944d044a699f01eb7ad4d3fc0e743ca33c74613fdeb06930077279d6559d797e9e5ef437968f088657f5ae71b01e8824d63759e5b8244a8deac0aecd3e SHA512 7a231bbaf88f94c79b1ace1c3e66bd520595905bfc8a7ffa1aa453ea6f056136b82aea3a321d97db4ccfd1212a41e8790badcc43222564d861e9e5c35e40a402
diff --git a/dev-util/breakpad/breakpad-2023.01.27.ebuild b/dev-util/breakpad/breakpad-2023.01.27.ebuild
index f577690b56e5..a9c53669718b 100644
--- a/dev-util/breakpad/breakpad-2023.01.27.ebuild
+++ b/dev-util/breakpad/breakpad-2023.01.27.ebuild
@@ -46,6 +46,10 @@ src_prepare() {
-e "/AS_VAR_APPEND/d" \
configure.ac \
|| die
+ sed -i \
+ -e 's|reinterpret_cast|static_cast|g' \
+ src/processor/minidump_processor_unittest.cc \
+ || die
eautoreconf
}
diff --git a/dev-util/breakpad/breakpad-2023.01.27.ebuild b/dev-util/breakpad/breakpad-2023.06.01.ebuild
similarity index 90%
copy from dev-util/breakpad/breakpad-2023.01.27.ebuild
copy to dev-util/breakpad/breakpad-2023.06.01.ebuild
index f577690b56e5..a9c53669718b 100644
--- a/dev-util/breakpad/breakpad-2023.01.27.ebuild
+++ b/dev-util/breakpad/breakpad-2023.06.01.ebuild
@@ -46,6 +46,10 @@ src_prepare() {
-e "/AS_VAR_APPEND/d" \
configure.ac \
|| die
+ sed -i \
+ -e 's|reinterpret_cast|static_cast|g' \
+ src/processor/minidump_processor_unittest.cc \
+ || die
eautoreconf
}
diff --git a/dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch b/dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch
new file mode 100644
index 000000000000..e12429add48e
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch
@@ -0,0 +1,129 @@
+--- a/src/common/linux/libcurl_wrapper.h 2022-06-07 21:55:00.387396660 +0200
++++ b/src/common/linux/libcurl_wrapper.h 2022-06-07 21:55:18.450145751 +0200
+@@ -36,7 +36,7 @@
+ #include <map>
+
+ #include "common/using_std_string.h"
+-#include "third_party/curl/curl.h"
++#include <curl/curl.h>
+
+ namespace google_breakpad {
+
+--- a/src/common/linux/http_upload.cc 2022-06-07 21:53:55.505298529 +0200
++++ b/src/common/linux/http_upload.cc 2022-06-07 21:54:17.944986506 +0200
+@@ -34,7 +34,7 @@
+
+ #include <assert.h>
+ #include <dlfcn.h>
+-#include "third_party/curl/curl.h"
++#include <curl/curl.h>
+
+ namespace {
+
+--- a/src/processor/disassembler_x86.h 2022-06-08 08:41:45.569686249 +0200
++++ b/src/processor/disassembler_x86.h 2022-06-08 08:42:09.049377873 +0200
+@@ -42,7 +42,7 @@
+ #include "google_breakpad/common/breakpad_types.h"
+
+ namespace libdis {
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+ }
+
+ namespace google_breakpad {
+--- a/Makefile.am 2022-06-08 08:51:35.221948155 +0200
++++ b/Makefile.am 2022-06-08 08:53:21.679551745 +0200
+@@ -176,7 +176,6 @@
+
+ lib_LIBRARIES += src/libbreakpad.a
+ pkgconfig_DATA += breakpad.pc
+-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
+
+ ## Programs
+ bin_PROGRAMS += \
+@@ -957,7 +956,7 @@
+ src/processor/stackwalker_x86.o \
+ src/processor/symbolic_constants_win.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ if LINUX_HOST
+@@ -1006,7 +1005,7 @@
+ $(AM_CPPFLAGS) $(TEST_CFLAGS)
+ src_processor_disassembler_x86_unittest_LDADD = \
+ src/processor/disassembler_x86.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+@@ -1118,7 +1117,7 @@
+ src/processor/stackwalker_x86.o \
+ src/processor/symbolic_constants_win.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ if LINUX_HOST
+@@ -1154,7 +1153,7 @@
+ src_processor_proc_maps_linux_unittest_LDADD = \
+ src/processor/logging.o \
+ src/processor/pathname_stripper.o \
+- src/third_party/libdisasm/libdisasm.a \
++ -ldisasm \
+ $(TEST_LIBS) \
+ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+@@ -1459,7 +1459,7 @@
+ src/processor/stackwalker_sparc.o \
+ src/processor/stackwalker_x86.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a
++ -ldisasm
+ if LINUX_HOST
+ src_processor_microdump_stackwalk_LDADD += \
+ src/common/linux/scoped_pipe.o \
+@@ -1507,7 +1507,7 @@
+ src/processor/stackwalker_x86.o \
+ src/processor/symbolic_constants_win.o \
+ src/processor/tokenize.o \
+- src/third_party/libdisasm/libdisasm.a
++ -ldisasm
+ if LINUX_HOST
+ src_processor_minidump_stackwalk_LDADD += \
+ src/common/linux/scoped_pipe.o \
+--- a/src/processor/exploitability_win.cc 2022-06-08 08:59:44.437471336 +0200
++++ b/src/processor/exploitability_win.cc 2022-06-08 09:00:04.061210421 +0200
+@@ -43,7 +43,7 @@
+ #include "processor/disassembler_x86.h"
+ #include "processor/logging.h"
+
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+
+ namespace google_breakpad {
+
+--- a/src/processor/disassembler_x86_unittest.cc 2022-06-08 10:30:23.370615114 +0200
++++ b/src/processor/disassembler_x86_unittest.cc 2022-06-08 10:30:44.003341412 +0200
+@@ -30,7 +30,7 @@
+
+ #include "breakpad_googletest_includes.h"
+ #include "processor/disassembler_x86.h"
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+
+ namespace {
+
+--- a/src/common/module.cc 2023-11-09 06:57:57.891443802 +0100
++++ b/src/common/module.cc 2023-11-09 06:58:16.688120866 +0100
+@@ -42,6 +42,7 @@
+ #include <iostream>
+ #include <memory>
+ #include <utility>
++#include <algorithm>
+
+ namespace google_breakpad {
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-20 21:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-11 7:58 [gentoo-commits] repo/gentoo:master commit in: dev-util/breakpad/, dev-util/breakpad/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2023-10-29 20:40 Alfredo Tupone
2024-09-20 21:02 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox