From d86d29fd6e33849ce77c23479a4d32b5f48e145b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Dec 2021 20:18:57 +0100
Subject: [PATCH] firefox-esr: unconditionally add ppc64 jit files

The build system references them even on non-ppc64 platforms.
---
 srcpkgs/firefox-esr/template | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 8ce09688fe..5a8d21f794 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -11,8 +11,10 @@ short_desc="Mozilla Firefox web browser - Extended Support Release"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=75e98daf53c5aea19d711a625d5d5e6dfdc8335965d3a19567c62f9d2961fc75
+distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz
+ https://github.com/chmeeedalf/gecko-dev/files/7729086/esrppcjit.tar.gz"
+checksum="75e98daf53c5aea19d711a625d5d5e6dfdc8335965d3a19567c62f9d2961fc75
+ 5e926a8be5d6d4949c3bc3eb98e2103692eaa26a98928db432b1d44b535f7241"
 
 lib32disabled=yes
 
@@ -37,14 +39,6 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="xptcall bitrot" ;;
 esac
 
-# ppc64le jit, see --enable-jit later
-case "$XBPS_TARGET_MACHINE" in
-ppc64le*)
-	distfiles+=" https://github.com/chmeeedalf/gecko-dev/files/7729086/esrppcjit.tar.gz"
-	checksum+=" 5e926a8be5d6d4949c3bc3eb98e2103692eaa26a98928db432b1d44b535f7241"
-	;;
-esac
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
@@ -70,12 +64,7 @@ post_extract() {
 	esac
 
 	# ppc64le jit, see --enable-jit later
-	case "$XBPS_TARGET_MACHINE" in
-	ppc64le*)
-		mv ../js/src/jit/ppc64 js/src/jit
-		rm -rf ../js
-		;;
-	esac
+	mv ../js/src/jit/ppc64 js/src/jit
 
 	# Mozilla API keys (see https://location.services.mozilla.com/api)
 	# Note: This is for Void Linux use ONLY.
@@ -107,8 +96,11 @@ do_build() {
         # https://www.talospace.com/2021/12/91esr-with-baseline-compilerbaseline.html
 	case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) echo "ac_add_options --enable-jit" >>.mozconfig ;;
-	ppc64*) ;;
-	ppc*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;;
+	ppc64*) echo "ac_add_options --disable-jit" >>.mozconfig ;;
+	ppc*)
+		echo "ac_add_options --disable-jit" >>.mozconfig
+		echo "ac_add_options --disable-webrtc" >>.mozconfig
+		;;
 	esac
 
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then