From 07ddfc944a2c237e26392c75925c50ed549efd1f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 8 Feb 2020 17:15:39 +0100
Subject: [PATCH] firefox-esr: use generic libatomic checks

---
 srcpkgs/firefox-esr/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 918c2090cf0..47c034a1cf7 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -31,16 +31,15 @@ build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio
 build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
 
 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*) ;;
-	ppc*)
-		makedepends+=" libatomic-devel"
-		broken="xptcall bitrot"
-		;;
+	ppc*) broken="xptcall bitrot" ;;
 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
 # file sanely... so just clear out the file list
@@ -86,15 +85,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
+
 	if [ "$CROSS_BUILD" ]; then
 		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
 			sed -n '/#include <...> search starts here:/,/End of search list./p' | \