From 8f2722474333379dcd8c875f23d274fe2fb25c61 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 4 Apr 2020 17:04:20 +0200 Subject: extra/firefox: split mozconfig for i686/pentium4, fixed non-SIMD build on i686 --- extra/firefox/PKGBUILD | 26 ++++++++++++++++++++++---- extra/firefox/mozconfig-i686.patch | Bin 0 -> 648 bytes extra/firefox/mozconfig-pentium4.patch | Bin 0 -> 616 bytes extra/firefox/mozconfig.patch | Bin 616 -> 0 bytes 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 extra/firefox/mozconfig-i686.patch create mode 100644 extra/firefox/mozconfig-pentium4.patch delete mode 100644 extra/firefox/mozconfig.patch diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 2fb535bf..6eaccdb4 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -1,8 +1,27 @@ # disable LTO as it has little benefit and uses too many resources # don't compile with clang, use gcc toolchain (clang has issues on IA32) -# TODO: document the rest.. -source+=('mozconfig.patch') -sha256sums+=('708605f390994587277d8357e8452a71fcbfab97394df9678b1b646539e4ce20') +# disable SIMD (SSE20 for i686 +# set correct compiler and toochain tools +if [ "${CARCH}" = "pentium4" ]; then + source+=('mozconfig-pentium4.patch') + sha256sums+=('708605f390994587277d8357e8452a71fcbfab97394df9678b1b646539e4ce20') +eval "$( + declare -f prepare | \ + sed ' + $ i patch -d .. -Np1 -i "$srcdir/mozconfig-pentium4.patch" + ' +)" +fi +if [ "${CARCH}" = "i686" ]; then + source+=('mozconfig-i686.patch') + sha256sums+=('b6688e8872da4651653d898ba832d078e30e901bc6b84df07494905320633f22') +eval "$( + declare -f prepare | \ + sed ' + $ i patch -d .. -Np1 -i "$srcdir/mozconfig-i686.patch" + ' +)" +fi eval "$( declare -f build | \ sed ' @@ -12,7 +31,6 @@ eval "$( declare -f prepare | \ sed ' $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" - $ i patch -d .. -Np1 -i "$srcdir/mozconfig.patch" ' )" diff --git a/extra/firefox/mozconfig-i686.patch b/extra/firefox/mozconfig-i686.patch new file mode 100644 index 00000000..5230d314 Binary files /dev/null and b/extra/firefox/mozconfig-i686.patch differ diff --git a/extra/firefox/mozconfig-pentium4.patch b/extra/firefox/mozconfig-pentium4.patch new file mode 100644 index 00000000..b179e883 Binary files /dev/null and b/extra/firefox/mozconfig-pentium4.patch differ diff --git a/extra/firefox/mozconfig.patch b/extra/firefox/mozconfig.patch deleted file mode 100644 index b179e883..00000000 Binary files a/extra/firefox/mozconfig.patch and /dev/null differ -- cgit v1.2.3-54-g00ecf