From dcbd889c1b8ce2511d87765728d768aa220b5ab0 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 30 Mar 2022 14:02:48 -0400 Subject: lw 98.0 stackrpms rc1 --- librewolf/debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'librewolf/debian/rules') diff --git a/librewolf/debian/rules b/librewolf/debian/rules index 4f823e2..43ac8e7 100755 --- a/librewolf/debian/rules +++ b/librewolf/debian/rules @@ -139,7 +139,7 @@ endif ifneq (,$(filter %i386 %amd64 armel armhf arm64,$(DEB_HOST_ARCH))) MOZ_FFVPX = 1 endif -ifneq (,$(filter i386 amd64 armel armhf,$(DEB_HOST_ARCH))) +ifneq (,$(filter i386 amd64 armel armhf arm64,$(DEB_HOST_ARCH))) CRASH_REPORTER = 1 endif ifneq (,$(filter mips%,$(DEB_HOST_ARCH))) @@ -195,7 +195,7 @@ $(call lazy,LIBAVCODEC,$$(shell awk -F\" '/libavcodec\.so/ { sub(/libavcodec\.so $(PREPROCESSED_FILES): VARS = GRE_VERSION $(PRODUCT) $(call uc,$(PRODUCT)) $(Product) MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) SHORT_SOURCE_CHANNEL DIST TRANSITION MOZ_FFVPX CRASH_REPORTER DEB_HOST_ARCH debian/control: VARS += L10N_PACKAGES_DEPS PRODUCT LIBAVCODEC $(PREPROCESSED_FILES): - $(PYTHON) ./mach python --no-virtualenv python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< -o $@ + MOZ_OBJDIR=debian/objdir MACH_USE_SYSTEM_PYTHON=1 $(PYTHON) ./mach python python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< -o $@ ifdef TRANSITION MAINTSCRIPTS := $(addprefix debian/,$(addsuffix .maintscript,$(shell awk -F/ '$$1 != "searchplugins" { next } $$2 == "locale" && $$3 != "en-US" { p="iceweasel-l10n-" $$3 } $$2 == "common" || ($$2 "/" $$3 == "locale/en-US") { p="iceweasel" } !done[p] { print p; done[p] = 1 }' debian/removed_conffiles))) @@ -296,7 +296,7 @@ override_dh_auto_clean:: dh_auto_clean --builddirectory=build-$(PRODUCT) dh_auto_clean --builddirectory=build-l10n find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f - rm -rf obj-*/.mozbuild $(MOZBUILD_STATE_PATH) + rm -rf debian/objdir $(MOZBUILD_STATE_PATH) override_dh_clean: dh_clean -XCargo.toml.orig -- cgit