chromium: unbreak glibc.
For some reason musl-fixes.patch breaks with glibc and haven't had enough time to investigate what's the broken chunk, so that for now just apply musl-fixes and resolver patches just for musl. Tested on glibc and musl still builds.
This commit is contained in:
parent
29ca955fc7
commit
6f9a13c277
|
@ -1,19 +1,27 @@
|
|||
--- ./breakpad/src/client/linux/handler/exception_handler.cc.orig
|
||||
+++ ./breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -460,7 +460,6 @@
|
||||
--- breakpad/src/client/linux/handler/exception_handler.cc.orig 2015-12-06 09:59:55.554536646 +0100
|
||||
+++ breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100
|
||||
@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel
|
||||
siginfo.si_code = SI_USER;
|
||||
siginfo.si_pid = getpid();
|
||||
struct ucontext context;
|
||||
- getcontext(&context);
|
||||
+#if defined(__GLIBC__)
|
||||
getcontext(&context);
|
||||
+#endif
|
||||
return HandleSignal(sig, &siginfo, &context);
|
||||
}
|
||||
|
||||
@@ -628,8 +627,6 @@
|
||||
@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() {
|
||||
sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
|
||||
|
||||
CrashContext context;
|
||||
- int getcontext_result = getcontext(&context.context);
|
||||
- if (getcontext_result)
|
||||
+
|
||||
+#if defined(__GLIBC__)
|
||||
int getcontext_result = getcontext(&context.context);
|
||||
if (getcontext_result)
|
||||
return false;
|
||||
+#else
|
||||
+ return false;
|
||||
+#endif
|
||||
|
||||
#if defined(__i386__)
|
||||
// In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
pkgname=chromium
|
||||
# See http://www.chromium.org/developers/calendar for the latest version
|
||||
version=47.0.2526.73
|
||||
revision=1
|
||||
revision=2
|
||||
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.chromium.org/"
|
||||
|
@ -34,7 +34,16 @@ if [ -z "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
|
|||
hostmakedepends+=" gcc-c++-multilib"
|
||||
fi
|
||||
|
||||
post_extract() {
|
||||
case "${XBPS_TARGET_MACHINE}" in
|
||||
*-musl)
|
||||
for f in ${FILESDIR}/musl-patches/*.patch; do
|
||||
patch -Np0 -i $f
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
}
|
||||
pre_configure() {
|
||||
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
|
||||
# XXX xtraeme: fix gcc{,-c++}-multilib instead.
|
||||
|
@ -56,7 +65,6 @@ pre_configure() {
|
|||
# https://code.google.com/p/chromium/issues/detail?id=541273
|
||||
sed -i "/'target_name': 'libvpx'/s/libvpx/&_new/" build/linux/unbundle/libvpx.gyp
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
local conf=""
|
||||
|
||||
|
|
Loading…
Reference in New Issue