From aa1a906667484c37d74ad8e02a5edefa25ce9ee4 Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 8 Feb 2020 17:15:48 +0100 Subject: [PATCH] thunderbird: use generic libatomic checks --- srcpkgs/thunderbird/template | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 71db371ee38..e85ccc945a3 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -31,19 +31,14 @@ 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 + armv6*) broken="required NEON extensions are not supported on armv6" ;; ppc64*) ;; - ppc*) broken="ftbfs in several places" ;; + ppc*) broken="xptcall bitrot" ;; esac -case $XBPS_TARGET_MACHINE in - armv6*) - broken="required NEON extensions are not supported on armv6" - ;; - ppc64*) ;; - ppc*) - makedepends+=" libatomic-devel" - ;; -esac +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi # we need this because cargo verifies checksums of all files in vendor # crates when it builds and gives us no way to override or update the @@ -89,15 +84,15 @@ do_build() { esac # webrtc currently fails to build on 32-bit ppc... - # also need explicit libatomic case "$XBPS_TARGET_MACHINE" in ppc64*) ;; - ppc*) - echo "ac_add_options --disable-webrtc" >>.mozconfig - export LDFLAGS+=" -latomic" - ;; + ppc*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;; esac + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + export LDFLAGS+=" -latomic" + fi + case "$XBPS_TARGET_MACHINE" in x86_64-musl|i686-musl) echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig