From 37021d4a81bdd37541a1cc2606aa8a5f3e0114ca Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 23 Aug 2018 14:49:50 -0400
Subject: libre/iceweasel: Clean up the ARM-specific hacks

 1. The sed expression to disable GOLD (x86-only) was broken, fix it
 2. We shouldn't disable PIE
 3. Why disable optimizing (what your ARM device isn't slow enough?)
 4. Don't disable WebRTC on ARM only
 5. Don't disable the ELF hack
---
 libre/iceweasel/PKGBUILD | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'libre/iceweasel/PKGBUILD')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index a083bff6b..a379819d8 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -102,20 +102,12 @@ ac_add_options --disable-updater
 ac_add_options --disable-eme
 END
 
-  if [[ "$CARCH" == arm* ]]; then
-    sed -i \
-        -e '/enable-gold/s/^/#/' \
-        -e '/enable-pie/s/^/#/' \
-        -e '/enable-optimize/d' \
-      .mozconfig
-
-    cat >> .mozconfig << END
-mk_add_options MOZ_MAKE_FLAGS="-j1"
-ac_add_options --disable-webrtc
-ac_add_options --disable-elf-hack
-ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
-END
-  fi
+  if [[ $CARCH = arm* ]]; then
+    sed -i '/--enable-linker=gold/d' .mozconfig
+    cat >> .mozconfig <<- END
+	ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+	END
+  fi # end [[ $CARCH = arm* ]]
 
   # perform rebranding
   local brandingdir="$srcdir/$pkgname-$_brandingver"
-- 
cgit v1.2.3