qt5-webengine: fix on ppc64le
This commit is contained in:
parent
323b40906a
commit
71ffc3b365
2 changed files with 47 additions and 0 deletions
|
@ -1074,6 +1074,42 @@ index b435499f4..ac8a84b6d 100644
|
||||||
} else {
|
} else {
|
||||||
public_configs = [ ":no_asm_config" ]
|
public_configs = [ ":no_asm_config" ]
|
||||||
}
|
}
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
|
||||||
|
index 5617de88..dc8bc176 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
|
||||||
|
@@ -598,7 +598,6 @@ if (is_linux || is_android) {
|
||||||
|
"breakpad/src/client/minidump_file_writer.h",
|
||||||
|
"breakpad/src/common/convert_UTF.cc",
|
||||||
|
"breakpad/src/common/convert_UTF.h",
|
||||||
|
- "breakpad/src/common/linux/breakpad_getcontext.S",
|
||||||
|
"breakpad/src/common/linux/elf_core_dump.cc",
|
||||||
|
"breakpad/src/common/linux/elf_core_dump.h",
|
||||||
|
"breakpad/src/common/linux/elfutils.cc",
|
||||||
|
@@ -636,6 +635,15 @@ if (is_linux || is_android) {
|
||||||
|
|
||||||
|
libs = [ "dl" ]
|
||||||
|
|
||||||
|
+ if (current_cpu == "ppc64") {
|
||||||
|
+ defines = [ "HAVE_GETCONTEXT" ]
|
||||||
|
+ #libs += [ "ucontext" ]
|
||||||
|
+ } else {
|
||||||
|
+ sources += [
|
||||||
|
+ "breakpad/src/common/linux/breakpad_getcontext.S"
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
include_dirs = [
|
||||||
|
".",
|
||||||
|
"breakpad/src",
|
||||||
|
@@ -686,7 +693,6 @@ if (is_linux || is_android) {
|
||||||
|
"breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
|
||||||
|
"breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
|
||||||
|
"breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
|
||||||
|
- "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
|
||||||
|
"breakpad/src/common/linux/elf_core_dump_unittest.cc",
|
||||||
|
"breakpad/src/common/linux/file_id_unittest.cc",
|
||||||
|
"breakpad/src/common/linux/linux_libc_support_unittest.cc",
|
||||||
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||||
index 07d9171a0..9aed4cb36 100644
|
index 07d9171a0..9aed4cb36 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||||
|
|
|
@ -75,6 +75,10 @@ case "$XBPS_TARGET_MACHINE" in
|
||||||
ppc64*) makedepends+=" libatomic-devel" ;;
|
ppc64*) makedepends+=" libatomic-devel" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
ppc64*-musl) makedepends+=" libucontext-devel" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
_bootstrap_gn() {
|
_bootstrap_gn() {
|
||||||
local opts
|
local opts
|
||||||
# Bootstrap gn (generate ninja)
|
# Bootstrap gn (generate ninja)
|
||||||
|
@ -128,6 +132,13 @@ post_patch() {
|
||||||
${wrksrc}/src/3rdparty/chromium/media/audio/openbsd
|
${wrksrc}/src/3rdparty/chromium/media/audio/openbsd
|
||||||
# Eternal 5.15.2, this can't ever be increased since other components are 5.15.2
|
# Eternal 5.15.2, this can't ever be increased since other components are 5.15.2
|
||||||
sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i .qmake.conf
|
sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i .qmake.conf
|
||||||
|
# enable libucontext on ppc with musl for breakpad
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
ppc64*-musl)
|
||||||
|
vsed -i 's,#libs +=,libs +=,' \
|
||||||
|
${wrksrc}/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
|
||||||
|
;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue