user/{firefox-esr,thunderbird}: Fix ARM TEXTRELs

TEXTRELs are due to assembly code for FFTs in ffvpx/libavcodec.

Since this is only used on "Android32 FLAC optimisation", it's likely
not worth it for our use cases.  Disable it.

Fixes: #1015

4 files changed, 37 insertions, 3 deletions

diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index c4b881eaf..4c9e50068 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -5,7 +5,7 @@ pkgver=91.13.0
 pkgrel=3
 pkgdesc="Firefox web browser (extended support release)"
 url="https://www.mozilla.org/firefox/"
-arch="all !ppc !armv7"  # #837, #1015
+arch="all !ppc"  # #837
 options="!check"  # Tests disabled
 license="MPL-2.0"
 depends=""
@@ -33,6 +33,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f
 
 	bad-google-code.patch
 	BTS-1074.patch
+	disable-arm-flac.patch
 	fix-mutex-build.patch
 	fix-seccomp-bpf.patch
 	gcc89074.patch
@@ -155,6 +156,7 @@ sha512sums="38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f25
 86168a5e5b8aa3ea7cc0d40174baa97595c82b8e599937155fbd7761e7df7220980c74f75e96c34e5f660423e42ad67761f57b2923389be363253868bac033a9  mozconfig
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
 57410e4b9199f3c7db1cd4a0cf3e67cd962b585730c073edb1cadc3bcac5b0aec4e6f7efe24f3eadd1020aefef475e08e97f13dc6b6534e639f33cc6fb1abe04  BTS-1074.patch
+33c6c9d845981137e41e396463c09a55c4effe56628f9f7a4e13b7328e4591b97bc607df484393994a9da07d701f2eaee4e30b463284159e4206e1c42a1a4cdc  disable-arm-flac.patch
 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
 6eb7fb134760f5d232710c56f18f14de4f533e41e269531edd01f5650f6d641513e34a8d2294af5ad6fd184736f674c734efb4cc003636a75e14a8fdba2fe3b0  gcc89074.patch
diff --git a/user/firefox-esr/disable-arm-flac.patch b/user/firefox-esr/disable-arm-flac.patch
new file mode 100644
index 000000000..fa1ba8753
--- /dev/null
+++ b/user/firefox-esr/disable-arm-flac.patch
@@ -0,0 +1,15 @@
+32-bit ARM assembler is mostly for Android32 accel anyway.
+
+It doesn't link properly on musl (TEXTRELs).
+
+--- firefox-91.13.0/toolkit/moz.configure.old	2023-10-09 10:40:18.231733637 +0000
++++ firefox-91.13.0/toolkit/moz.configure	2023-10-10 02:22:34.743712070 +0000
+@@ -1894,7 +1894,7 @@
+                 flac_only = True
+         elif target.cpu == "x86_64":
+             flags = ["-D__x86_64__", "-DPIC", "-DELF", "-Pconfig_unix64.asm"]
+-        elif target.cpu in ("x86", "arm", "aarch64"):
++        elif target.cpu in ("x86", "aarch64"):
+             flac_only = True
+         else:
+             enable = False
diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index 78ee2c13e..ec73faadd 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -4,7 +4,7 @@ pkgver=91.13.0
 pkgrel=2
 pkgdesc="Email client from Mozilla"
 url="https://www.thunderbird.net/"
-arch="all !ppc !armv7"  # #837, #1015
+arch="all !ppc"  # #837
 options="!check"  # Tests disabled
 license="MPL-2.0"
 depends=""
@@ -28,6 +28,7 @@ source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun
 
 	bad-google-code.patch
 	BTS-1074.patch
+	disable-arm-flac.patch
 	fix-mutex-build.patch
 	fix-seccomp-bpf.patch
 	gcc89074.patch
@@ -87,7 +88,7 @@ prepare() {
 	echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig
 
 	case "$CARCH" in
-		pmmx|x86*)
+		pmmx|x86*|arm*)
 			echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig
 			;;
 		s390x)
@@ -152,6 +153,7 @@ sha512sums="e73d3db4333ad659ec1ab249bd261e8c28301c125d0c39b473c83f8fccace6d4916a
 afc87cdd19500f8b6b0bedabe98339cca9e6af86edb45e673c6ee0a49bdb3a48b1816f6f5f8790cab86cca428ab7f142cbeb6462079fe293f5f13563a7761896  mozconfig
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
 df76bae9deaaae98afa9e1e853de5d41a4f84db65057bfe70de3ae172515bdef58a5f9ee0b2303493dc67e9a6aad54af4c9931166de1144737a5867f24b51a4f  BTS-1074.patch
+b44c55fb38b856791dd6966c5af24b657c0516d4f747fc0595eb470f58aa4b6e28c4304892589c6f9d623daba2e0fadc338303da409c4542a98d369339438ebe  disable-arm-flac.patch
 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
 6eb7fb134760f5d232710c56f18f14de4f533e41e269531edd01f5650f6d641513e34a8d2294af5ad6fd184736f674c734efb4cc003636a75e14a8fdba2fe3b0  gcc89074.patch
diff --git a/user/thunderbird/disable-arm-flac.patch b/user/thunderbird/disable-arm-flac.patch
new file mode 100644
index 000000000..dff387361
--- /dev/null
+++ b/user/thunderbird/disable-arm-flac.patch
@@ -0,0 +1,15 @@
+32-bit ARM assembler is mostly for Android32 accel anyway.
+
+It doesn't link properly on musl (TEXTRELs).
+
+--- thunderbird-91.13.0/toolkit/moz.configure.old	2023-10-09 10:40:18.231733637 +0000
++++ thunderbird-91.13.0/toolkit/moz.configure	2023-10-10 02:22:34.743712070 +0000
+@@ -1894,7 +1894,7 @@
+                 flac_only = True
+         elif target.cpu == "x86_64":
+             flags = ["-D__x86_64__", "-DPIC", "-DELF", "-Pconfig_unix64.asm"]
+-        elif target.cpu in ("x86", "arm", "aarch64"):
++        elif target.cpu in ("x86", "aarch64"):
+             flac_only = True
+         else:
+             enable = False