[iceweasel]: WIP - i686

1 files changed, 20 insertions, 17 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index a1e4a7681..253bed092 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -164,10 +164,7 @@ armv7h)
 i686)
   _should_skip_pgo=1
 
-  makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin
-  makedepends=( ${makedepends[*]/wasi-libc++*/}                                )
-  makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0              ) # dustbin
-  makedepends+=( llvm13                                                        ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory
+   echo "i686 v>104<106 failed to build - i686 v106 fails to build without --disable-webrtc"
   ;;
 esac
 
@@ -380,21 +377,27 @@ EOF
     # disable SIMD (SSE2 for i686)
     # set correct compiler and toochain tools
     cat >>../mozconfig <<END
-ac_add_options --disable-linker=lld
-ac_add_options --enable-linker=bfd
+#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 --enable-strip
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
-export CC=gcc
-export CXX=g++
-export AR=gcc-ar
-export NM=gcc-nm
-export RANLIB=gcc-ranlib
-export STRIP=strip
+#export CC=gcc
+#export CXX=g++
+#export AR=gcc-ar
+#export NM=gcc-nm
+#export RANLIB=gcc-ranlib
+#export STRIP=strip
 END
 
+    # FIXME GCC: /usr/lib/gcc/i686-pc-linux-gnu/12.1.0/include/xmmintrin.h:208:1: error: inlining failed in call to ‘always_inline’ ‘__m128 _mm_sqrt_ps(__m128)’: target specific option mismatch
+    # FIXME LLVM: /build/iceweasel/src/firefox-106.0.1/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc:110:27: error: always_inline function '_mm_loadu_ps' requires target feature 'sse', but would be inlined into function 'ComputeFrequencyResponse_Sse2' that is compiled without support for 'sse'
+    echo "ac_add_options --disable-webrtc" >> ../mozconfig
+
+    sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk # FIXME: is this needed?
+
     # readelf: Error: Unable to seek to 0x801db328 for section headers
     echo "applying avoid-libxul-OOM-python-check.patch"
     patch -p1 -i ../avoid-libxul-OOM-python-check.patch
@@ -608,8 +611,8 @@ build() {
 
     # try hard to tell ld and rust not to use too much memory (no lto, no debug info, etc.)
     export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
-    export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-#     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--max-cache-size=16384000 "
+#    export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" # with GCC
+    export LDFLAGS+=" -Wl,--no-keep-memory "                               # without GCC
 
     # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one
     # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding
@@ -634,7 +637,7 @@ build() {
     ;;
   i686)
     # /usr/bin/ld.bfd: error: libxul.so(.debug_info) is too large (0x54c5369a bytes)
-    options=( ${options[*]/\!strip/} )
+#     options=( ${options[*]/\!strip/} )
 
     # avoid excessive debug symbols in rust leading to out-of-memory situations
     sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure
@@ -782,7 +785,7 @@ END
     # disable stripping in mozconfig.<arch> (insists to use llvm-strip which runs
     # out of memory on libxul.so). Now 2.5 GB can be stripped to 166 MB, so we do
     # that with the normal 'strip' from binutils after 'mach install'
-   strip "$pkgdir/usr/lib/$pkgname/libxul.so"
+#    strip "$pkgdir/usr/lib/$pkgname/libxul.so"
     ;;
   x86_64)
     ;;