thunderbird: add patch to fix rust target detection

This commit is contained in:
Johannes 2020-06-08 19:03:13 +02:00
parent 579d04af0b
commit d142de97a6
2 changed files with 26 additions and 1 deletions

View 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]

View File

@ -34,7 +34,6 @@ case $XBPS_TARGET_MACHINE in
armv6*) broken="required NEON extensions are not supported on armv6" ;; armv6*) broken="required NEON extensions are not supported on armv6" ;;
ppc64*) ;; ppc64*) ;;
ppc*) broken="xptcall bitrot" ;; ppc*) broken="xptcall bitrot" ;;
armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/26107/steps/shell_3/logs/stdio";;
esac esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then