From 67543610649d27431b8f5d3aaed572305e2a8918 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Tue, 22 Dec 2020 13:37:41 -0500 Subject: [icedove][iceweasel]: housekeeping - refactor anti-features check these changes are an attempt to normalize common patching implementations, in order to reduce the diffs across all of our mozilla PKGBUILDs --- nonprism/icedove/PKGBUILD | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'nonprism') diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index f4b7e57ea..589618fb5 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -205,22 +205,23 @@ END build() { cd $_pkgname-$pkgver - # clang-10: error: unknown argument: '-fvar-tracking-assignments' + # clang-{9,10,11} -> error: unknown argument: '-fvar-tracking-assignments' CFLAGS="${CFLAGS/-fvar-tracking-assignments/}" CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}" - if [[ $CARCH = armv7h ]]; then - export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk - sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure - export MOZ_MAKE_FLAGS=-j1 - fi - - if [[ $CARCH = i686 ]]; then - sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk - sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure - export MOZ_MAKE_FLAGS=-j1 - fi + case "${CARCH}" in + armv*) + export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk + sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure + export MOZ_MAKE_FLAGS=-j1 + ;; + i686) + sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk + sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure + export MOZ_MAKE_FLAGS=-j1 + ;; + esac ./mach configure ./mach build -- cgit v1.2.3