gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/breakpad: bump to 2023.06.01 and fix musl build

Browse Source 
Closes: https://bugs.gentoo.org/936393
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
Alfredo Tupone
2024-09-20 23:00:48 +02:00
parent cd2e586412
commit ab3e1e5cf5
4 changed files with 195 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-util/breakpad/Manifest
View File

@@ -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

4
dev-util/breakpad/breakpad-2023.01.27.ebuild
View File

@@ -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
}

61
dev-util/breakpad/breakpad-2023.06.01.ebuild Normal file
View File

@@ -0,0 +1,61 @@
# Copyright 2022-2024 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 tools"
RDEPEND="
net-misc/curl
"
DEPEND="${RDEPEND}
dev-libs/linux-syscall-support
dev-embedded/libdisasm
"
BDEPEND="test? ( dev-cpp/gtest )"
RESTRICT="!test? ( test )"
REQUIRED_USE="elibc_musl? ( !tools )"
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
sed -i \
-e 's|reinterpret_cast|static_cast|g' \
src/processor/minidump_processor_unittest.cc \
|| die
eautoreconf
}
src_configure() {
econf \
--enable-system-test-libs \
$(use_enable tools) \
|| die
}

129
dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch Normal file
View File

@@ -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 {