diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-10-10 00:03:35 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-10-10 00:06:27 -0500 |
| commit | 36bdfddebba10f293834570557e6f097ab6893e5 (patch) | |
| tree | b042088241f1acf221883a65ed6df08580d17c20 /user/thunderbird | |
| parent | ddc221fb76fd6de641e3fd3af9c4c99eb828e00d (diff) | |
| download | packages-36bdfddebba10f293834570557e6f097ab6893e5.tar.gz packages-36bdfddebba10f293834570557e6f097ab6893e5.tar.bz2 packages-36bdfddebba10f293834570557e6f097ab6893e5.tar.xz packages-36bdfddebba10f293834570557e6f097ab6893e5.zip | |
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
Diffstat (limited to 'user/thunderbird')
| -rw-r--r-- | user/thunderbird/APKBUILD | 6 | ||||
| -rw-r--r-- | user/thunderbird/disable-arm-flac.patch | 15 |
2 files changed, 19 insertions, 2 deletions
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 |