[icedove]: tweak for armv7h

1 files changed, 29 insertions, 28 deletions

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 96ea88485..ff06ce2e4 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -58,7 +58,6 @@ source=(https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun
         rustc_version-0.4.0.patch)
 source=( ${source[*]/metainfo.patch/} ) # branding
 source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig})
-source_armv7h=(arm-wasm-vfp.patch)
 validpgpkeys=(
   14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases <release@mozilla.com>
   4360FE2109C49763186F8E21EBE41E90F6F12F6D # Mozilla Software Releases <release@mozilla.com>
@@ -67,6 +66,15 @@ validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536  # Andreas Grapentin
                3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40) # bill-auger
 
 
+## dependency tweaks ##
+
+case "${CARCH}" in
+armv7h)
+  makedepends=( ${makedepends[*]/wasi-*/} ) # armv7h has no wasi compiler
+  ;;
+esac
+
+
 prepare() {
   cd $_pkgname-$pkgver
 
@@ -88,24 +96,32 @@ prepare() {
 
   # per-arch config
   case "${CARCH}" in
-  armv*)
-    patch -Np1 -i "${srcdir}"/arm-wasm-vfp.patch
-
-    sed -i '/--enable-linker=gold/d' .mozconfig
-    sed -i '/--enable-hardening/d' .mozconfig
-    sed -i '/--enable-optimize/d' .mozconfig
+  armv7h|aarch64)
+    if [[ $CARCH == "armv7h" ]]; then
+      echo "ac_add_options --disable-elf-hack" >> .mozconfig
+      MAKEFLAGS="-j4"
+      # disable hard-coded LTO
+      sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk
+      sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk
+      # increase codegen-units due to RAM constraints
+      sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk
+    fi
+
+    echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig
+    echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig
 
     export MOZ_DEBUG_FLAGS=" "
     export CFLAGS+=" -g0"
     export CXXFLAGS+=" -g0"
-    export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+    #export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+    export LDFLAGS+=" -Wl,--no-keep-memory"
     export RUSTFLAGS="-Cdebuginfo=0"
+    CFLAGS=${CFLAGS/-fstack-clash-protection}
+    CXXFLAGS=${CXXFLAGS/-fstack-clash-protection}
 
-    cat >> .mozconfig <<END
-ac_add_options --disable-webrtc
-ac_add_options --disable-elf-hack
-ac_add_options --enable-optimize="-g0 -O2"
-END
+    # archarm has these in mozconfig.cfg
+    sed -i 's|with-wasi-sysroot.*|without-wasm-sandboxed-libraries|' .mozconfig
+    echo "ac_add_options --disable-webrtc"                        >> .mozconfig
     ;;
   i686)
     sed -i 's/--enable-linker=gold/--enable-linker=bfd/' .mozconfig
@@ -178,20 +194,6 @@ EOF
 build() {
   cd $_pkgname-$pkgver
 
-  case "${CARCH}" in
-    armv*)
-      export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-      sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk
-      sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure
-      export MOZ_MAKE_FLAGS=-j1
-      ;;
-    i686)
-      sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk
-      sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure
-      export MOZ_MAKE_FLAGS=-j1
-      ;;
-  esac
-
   if [[ -n "${SOURCE_DATE_EPOCH}" ]]; then
     export MOZ_BUILD_DATE=$(date --date "@${SOURCE_DATE_EPOCH}" "+%Y%m%d%H%M%S")
   fi
@@ -252,4 +254,3 @@ sha512sums=('0de88cef22e7b239804e27705b577dd34a86487512bb2af29804b358d056628c140
 )
 sha512sums+=('c424e546b007bfd944f2cefcc73a5a98212a44e7ad54904a7d05dbc494664583af6d50eae8228101671575f3a5df1e79be31fabe1c26c3eec07cef90583691d0'
              'SKIP')
-sha512sums_armv7h=('c25883c4860e511a99d9fbfba5b824145c0862729101721605725f609ca2a41848b741dd100eff390f57031dc5f14af3ea30133de30f75cb20197c420ae20972')