From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [TESTING] firefox: fix build for armv7hf-musl
Date: Mon, 28 Oct 2019 06:36:10 +0100 [thread overview]
Message-ID: <20191028053610.01K_o6hcLRVOs_1Tm-vuuF021G0tKt1NMcuta2D1ZaU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15847@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages firefox
https://github.com/void-linux/void-packages/pull/15847
[TESTING] firefox: fix build for armv7hf-musl
A patch file from https://github.com/void-linux/void-packages/pull/15847.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-15847.patch --]
[-- Type: text/x-diff, Size: 2665 bytes --]
From 531a0e9908a41c3b82468b9625c5ac00ae8305fd Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 12:28:31 +0700
Subject: [PATCH] firefox: fix build for armv7hf-musl
[skip ci]
---
.../firefox/patches/musl-rust.configure.patch | 26 +++++++++++++++++++
srcpkgs/firefox/template | 3 +--
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/firefox/patches/musl-rust.configure.patch
diff --git a/srcpkgs/firefox/patches/musl-rust.configure.patch b/srcpkgs/firefox/patches/musl-rust.configure.patch
new file mode 100644
index 00000000000..d8f387136e0
--- /dev/null
+++ b/srcpkgs/firefox/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
+@@ -297,11 +297,20 @@
+ suffix = 'hf'
+ else:
+ suffix = ''
++
++ narrowed = []
+ for p in prefixes:
+ for c in candidates:
+- if c.rust_target.startswith('{}-'.format(p)) and \
+- c.rust_target.endswith(suffix):
+- return c.rust_target
++ if c.rust_target.startswith('{}-'.format(p)):
++ narrowed.append(c.rust_target)
++
++ for target in narrowed:
++ if target.endswith(host_or_target.raw_os):
++ return target
++
++ for target in narrowed:
++ if target.endswith(suffix):
++ return target
+
+ # See if we can narrow down on the exact alias
+ narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 4b6112bb392..e9d8c72d0e4 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
#
pkgname=firefox
version=70.0
-revision=1
+revision=2
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
@@ -32,7 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
case $XBPS_TARGET_MACHINE in
- armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21533/steps/shell_3/logs/stdio" ;;
armv6*)
broken="required NEON extensions are not supported on armv6"
;;
next prev parent reply other threads:[~2019-10-28 5:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 5:35 [PR PATCH] " voidlinux-github
2019-10-28 5:36 ` voidlinux-github [this message]
2019-10-28 5:36 ` [PR PATCH] [Updated] [TESTING] " voidlinux-github
2019-10-28 20:01 ` voidlinux-github
2019-10-29 0:16 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-29 0:16 ` voidlinux-github
2019-10-29 5:32 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028053610.01K_o6hcLRVOs_1Tm-vuuF021G0tKt1NMcuta2D1ZaU@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).