mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-22 17:17:03 +02:00
firefox: fix build for armv7hf-musl
[skip ci]
This commit is contained in:
parent
a48d61b6bb
commit
cd02f4d680
2 changed files with 26 additions and 1 deletions
26
srcpkgs/firefox/patches/musl-rust.configure.patch
Normal file
26
srcpkgs/firefox/patches/musl-rust.configure.patch
Normal file
|
@ -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]
|
|
@ -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"
|
||||
;;
|
||||
|
|
Loading…
Add table
Reference in a new issue