housekeeping - minimize diff between icecat and iceweasel

2 files changed, 28 insertions, 11 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 02ea629ce..9636fc209 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -32,7 +32,8 @@
 #       or include code for anti-features; but those will be filtered-out subsequently.
 #       Any code which implements an anti-feature should be commented-out;
 #       and include an 'anti-feature' comment, for clarity.
-#       Any blacklisted dependencies and non-free sources should be filtered.
+#       Any blacklisted dependencies and non-free sources should be filtered,
+#       and include a 'non-free' comment, for clarity.
 #       Without those over-rides, the resulting program may not be FSDG-fit.
 #       Do not circumvent those over-rides, if compiling for the Parabola repos.
 
@@ -156,7 +157,7 @@ _check_patching() {
 ## business ##
 
 prepare() {
-  mkdir -p mozbuild
+  mkdir mozbuild
   cd "$srcdir/$pkgname-${pkgver%%_*}"
 
 
@@ -232,7 +233,7 @@ END
 
   case ${CARCH} in
   aarch64|armv7h)
-    # version-specific parabola hacks
+    # version-specific hacks
     cat >> ../mozconfig <<EOF
 export CC=gcc
 export CXX=g++
@@ -272,7 +273,6 @@ EOF
 
     # archarm `export` commands are under the '[ARCH-SPECIFIC BUILD ENV]' section
 
-    echo "applying build-arm-libopus.patch"
     patch -p1 -i ../build-arm-libopus.patch
 
     # At this point in the script, the arch, arch32, and parabola PKGBUILDs
@@ -295,6 +295,9 @@ ac_add_options --disable-linker=lld
 ac_add_options --enable-linker=bfd
 ac_add_options --disable-lto
 ac_add_options --disable-rust-simd
+ac_add_options --enable-strip
+ac_add_options --disable-debug
+ac_add_options --disable-debug-symbols
 export CC=gcc
 export CXX=g++
 export AR=gcc-ar
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index e7961e06c..01fcd9f9f 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -62,7 +62,8 @@
 #       or include code for anti-features; but those will be filtered-out subsequently.
 #       Any code which implements an anti-feature should be commented-out;
 #       and include an 'anti-feature' comment, for clarity.
-#       Any blacklisted dependencies and non-free sources should be filtered.
+#       Any blacklisted dependencies and non-free sources should be filtered,
+#       and include a 'non-free' comment, for clarity.
 #       Without those over-rides, the resulting program may not be FSDG-fit.
 #       Do not circumvent those over-rides, if compiling for the Parabola repos.
 
@@ -299,12 +300,23 @@ END
 
   case ${CARCH} in
   aarch64|armv7h)
-    # archarm has these changes in-line above
+    # version-specific hacks
+    cat >> ../mozconfig <<EOF
+export CC=gcc
+export CXX=g++
+export AR=gcc-ar
+export NM=gcc-nm
+export RANLIB=gcc-ranlib
+EOF
+    echo 'ac_add_options --with-system-icu' >> ../mozconfig # ld.lld: error: undefined hidden symbol: std::type_info::operator==(std::type_info const&) const
+
+    # archarm has these differences in ## general configuration ## above
     sed -i '
       /--enable-hardening/d
       /--enable-optimize/d
       /--enable-rust-simd/d
       s| --with-wasi-sysroot=.*| --without-wasm-sandboxed-libraries|
+      /--disable-eme/d
     ' ../mozconfig
 
     if [[ $CARCH == "armv7h" ]]; then
@@ -312,7 +324,7 @@ END
       # https://bugzilla.redhat.com/show_bug.cgi?id=1641623
       echo "ac_add_options --disable-av1" >> .mozconfig
       # reduce jobs due to RAM constraints
-      MAKEFLAGS="-j1"
+      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
@@ -323,17 +335,19 @@ END
     elif [[ $CARCH == "aarch64" ]]; then
       echo 'ac_add_options --enable-rust-simd' >> .mozconfig
     fi
-
     echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig
     echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig
 
-    # archarm export statements are under the '[ARCH-SPECIFIC BUILD ENV]' section
+    # archarm `export` commands are under the '[ARCH-SPECIFIC BUILD ENV]' section
 
     patch -p1 -i ../build-arm-libopus.patch
 
-    # For consistency across arches, we actually want .mozconfig to be ../mozconfig.
+    # At this point in the script, the arch, arch32, and parabola PKGBUILDs
+    # have prepared a temporary ${srcdir}/mozconfig; but the archarm PKGBUILD
+    # writes directly to the final firefox-$pkgver/.mozconfig.
     # We allowed .mozconfig to be written above, only to minimize the diff against archarm.
-    # ${srcdir}/mozconfig will clobber firefox-$pkgver/.mozconfig later, in build()
+    # For consistency across arches, we move it to ${srcdir}/mozconfig now.
+    # ${srcdir}/mozconfig will clobber firefox-$pkgver/.mozconfig later, in build().
     cat .mozconfig >> ../mozconfig
     ;;
   i686)