diff options
| author | grizzlyuser <grizzlyuser@protonmail.com> | 2020-02-12 12:39:16 +0200 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2020-03-13 05:57:41 +0100 |
| commit | 2f7ddb1a66ee6f6d1714736c1fc7fc00157b02a4 (patch) | |
| tree | edc989ebe7d4c3e1802893513712ac78181ee16a /libre | |
| parent | 2e87bd712cfb0ea64f14e0e6a7a3dcdd96b08098 (diff) | |
| download | abslibre-2f7ddb1a66ee6f6d1714736c1fc7fc00157b02a4.tar.gz abslibre-2f7ddb1a66ee6f6d1714736c1fc7fc00157b02a4.tar.bz2 abslibre-2f7ddb1a66ee6f6d1714736c1fc7fc00157b02a4.zip | |
Sync with changes from Arch Linux ARM Firefox 73.0-1
Let's stick as close to upstream as possible. I've made these changes
after comparing PKGBUILDs from Arch Linux and Arch Linux ARM. For ARM,
some options like "ac_add_options --enable-hardening" are commented,
and that does not mean they can be replaced by e.g.
"ac_add_options --disable-hardening". Instead, that means these options
are just reset to default values, which can be different now or later.
Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 30 | ||||
| -rw-r--r-- | libre/iceweasel/arm.patch | 8 |
2 files changed, 24 insertions, 14 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index f285904dd..f3668831f 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -5,6 +5,7 @@ # Maintainer (alarm): Kevin Mihelich <kevin@archlinuxarm.org> # Maintainer (arch32): Andreas Baumann <mail@andreasbaumann.cc> # Contributor (arch32): Erich Eckner <git@eckner.net> +# Contributor (Arch Linux ARM): Kevin Mihelich <kevin@archlinuxarm.org> # Contributor: Andreas Grapentin <andreas@grapentin.org> # Contributor: Luke Shumaker <lukeshu@parabola.nu> # Contributor: André Silva <emulatorman@hyperbola.info> @@ -148,20 +149,26 @@ END ## [ARCH-SPECIFIC CONFIG] ## case ${CARCH} in armv7h) + sed -i ' + /--enable-hardening/d + /--enable-optimize/d + /--enable-rust-simd/d + ' ../mozconfig + cat >>../mozconfig <<END -ac_add_options --disable-hardening -ac_add_options --disable-optimize -ac_add_options --enable-optimize="-g0 -O2" -ac_add_options --disable-rust-simd -ac_add_options --disable-lto export CC=clang export CXX=clang++ +ac_add_options --disable-webrtc ac_add_options --disable-elf-hack + +# https://bugzilla.redhat.com/show_bug.cgi?id=1641623 ac_add_options --disable-av1 +ac_add_options --enable-optimize="-g0 -O2" END # mk_add_options MOZ_MAKE_FLAGS=${MAKEFLAGS} # from archlinuxarm # mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration + # EME is disabled anyway in the built package, but better check if it exists for ARM each new release. sed -i 's|ac_add_options --disable-eme||' ../mozconfig echo "applying arm.patch" @@ -282,10 +289,12 @@ build() { # LTO needs more open files ulimit -n 4096 - # -fno-plt with cross-LTO causes obscure LLVM errors - # LLVM ERROR: Function Import: link error - CFLAGS="${CFLAGS/-fno-plt/}" - CXXFLAGS="${CXXFLAGS/-fno-plt/}" + if [[ $CARCH != armv7h ]]; then + # -fno-plt with cross-LTO causes obscure LLVM errors + # LLVM ERROR: Function Import: link error + CFLAGS="${CFLAGS/-fno-plt/}" + CXXFLAGS="${CXXFLAGS/-fno-plt/}" + fi # DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments' CFLAGS="${CFLAGS/-fvar-tracking-assignments/}" @@ -298,8 +307,7 @@ build() { export CFLAGS+=" -g0" export CXXFLAGS+=" -g0" export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" -# export RUSTFLAGS="-Cdebuginfo=0" # from archlinuxarm - export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off" # archlinuxarm has --disable-lto but not -Clto=off + export RUSTFLAGS="-Cdebuginfo=0" # skipping PGO "instrumented browser"; so we have the final .mozconfig now cp ../mozconfig .mozconfig diff --git a/libre/iceweasel/arm.patch b/libre/iceweasel/arm.patch index c0f15ee60..9e2ed1510 100644 --- a/libre/iceweasel/arm.patch +++ b/libre/iceweasel/arm.patch @@ -1,6 +1,8 @@ -diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp -index 636537f847..0f3461af16 100644 ---- a/js/src/wasm/WasmSignalHandlers.cpp +https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + +diff --git a/js/src/wasm/WasmSignalHandlers.cpp.orig b/js/src/wasm/WasmSignalHandlers.cpp +index 636537f..0f3461a 100644 +--- a/js/src/wasm/WasmSignalHandlers.cpp.orig +++ b/js/src/wasm/WasmSignalHandlers.cpp @@ -244,7 +244,7 @@ using mozilla::DebugOnly; // emulation here. |