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"
 		;;