Skip to content

Commit

Permalink
firefox: update to 87.0.
Browse files Browse the repository at this point in the history
doesn't build on musl yet, see:
rust-minidump/minidump-writer#4

probably won't build on ppc either, see:
https://github.com/msirringhaus/minidump_writer_linux/tree/main/src/thread_info
  • Loading branch information
ericonr committed Mar 24, 2021
1 parent ef81605 commit ffb93f8
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 23 deletions.
51 changes: 51 additions & 0 deletions srcpkgs/firefox/patches/musl-minidump.patch
@@ -0,0 +1,51 @@
diff --git third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs
index 0d427ae3..12e71446 100644
--- third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs
+++ third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs
@@ -532,6 +532,33 @@ pub const PRIO_PROCESS: ::c_int = 0;
pub const PRIO_PGRP: ::c_int = 1;
pub const PRIO_USER: ::c_int = 2;

+// sys/auxv.h
+pub const AT_NULL: ::c_ulong = 0;
+pub const AT_IGNORE: ::c_ulong = 1;
+pub const AT_EXECFD: ::c_ulong = 2;
+pub const AT_PHDR: ::c_ulong = 3;
+pub const AT_PHENT: ::c_ulong = 4;
+pub const AT_PHNUM: ::c_ulong = 5;
+pub const AT_PAGESZ: ::c_ulong = 6;
+pub const AT_BASE: ::c_ulong = 7;
+pub const AT_FLAGS: ::c_ulong = 8;
+pub const AT_ENTRY: ::c_ulong = 9;
+pub const AT_NOTELF: ::c_ulong = 10;
+pub const AT_UID: ::c_ulong = 11;
+pub const AT_EUID: ::c_ulong = 12;
+pub const AT_GID: ::c_ulong = 13;
+pub const AT_EGID: ::c_ulong = 14;
+pub const AT_PLATFORM: ::c_ulong = 15;
+pub const AT_HWCAP: ::c_ulong = 16;
+pub const AT_CLKTCK: ::c_ulong = 17;
+// AT_* values 18 through 22 are reserved
+pub const AT_SECURE: ::c_ulong = 23;
+pub const AT_BASE_PLATFORM: ::c_ulong = 24;
+pub const AT_RANDOM: ::c_ulong = 25;
+pub const AT_HWCAP2: ::c_ulong = 26;
+
+pub const AT_EXECFN: ::c_ulong = 31;
+
extern "C" {
pub fn sendmmsg(
sockfd: ::c_int,
diff --git third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs
index 0e34a6dd..5763eb7e 100644
--- third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs
+++ third_party/rust/minidump_writer_linux/src/linux_ptrace_dumper.rs
@@ -108,7 +108,7 @@ impl LinuxPtraceDumper {
Err(_) => continue,
}
}
- #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+ #[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "x86"), target_env = "gnu"))]
{
// On x86, the stack pointer is NULL or -1, when executing trusted code in
// the seccomp sandbox. Not only does this cause difficulties down the line
21 changes: 0 additions & 21 deletions srcpkgs/firefox/patches/rust-has-i128.patch

This file was deleted.

6 changes: 4 additions & 2 deletions srcpkgs/firefox/template
Expand Up @@ -3,15 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
version=86.0.1
version=87.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
checksum=74f99c226ae6747f0170566f4f88be410866b0120214d2a593566cd1fff3d3df
checksum=ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab

lib32disabled=yes

Expand Down Expand Up @@ -65,6 +65,8 @@ post_extract() {

post_patch() {
_clear_vendor_checksums num-traits
_clear_vendor_checksums libc
_clear_vendor_checksums minidump_writer_linux
}

do_build() {
Expand Down

0 comments on commit ffb93f8

Please sign in to comment.