From d142de97a6c82e4b52b6fdd6f9f62cb99c8c5a87 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 8 Jun 2020 19:03:13 +0200 Subject: [PATCH] thunderbird: add patch to fix rust target detection --- .../patches/musl-rust.configure.patch | 26 +++++++++++++++++++ srcpkgs/thunderbird/template | 1 - 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/thunderbird/patches/musl-rust.configure.patch diff --git a/srcpkgs/thunderbird/patches/musl-rust.configure.patch b/srcpkgs/thunderbird/patches/musl-rust.configure.patch new file mode 100644 index 00000000000..d8f387136e0 --- /dev/null +++ b/srcpkgs/thunderbird/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/thunderbird/template b/srcpkgs/thunderbird/template index e921ae27fad..6db05bd70c5 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -34,7 +34,6 @@ case $XBPS_TARGET_MACHINE in armv6*) broken="required NEON extensions are not supported on armv6" ;; ppc64*) ;; ppc*) broken="xptcall bitrot" ;; - armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/26107/steps/shell_3/logs/stdio";; esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then