From 7574335d81a9d3c8218318d471f592e3b015da0d Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 21 Aug 2020 19:50:08 +0300 Subject: [PATCH] office: initial arch handling There's no LibreOffice-still on e2k (no 6.x for now, just a single production 5.x build); and there's no office (neither LO nor abiword/gnumeric) at all on riscv64 as of today. These nuances shouldn't bother release managers each time but should lurk under this feature's cover. --- features.in/office/config.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/features.in/office/config.mk b/features.in/office/config.mk index abde98bc..cadec574 100644 --- a/features.in/office/config.mk +++ b/features.in/office/config.mk @@ -1,15 +1,19 @@ use/office: @$(call add_feature) +ifneq (,$(filter-out riscv64,$(ARCH))) @$(call try,THE_OFFICE,abiword gnumeric) @$(call add,THE_PACKAGES,$$(THE_OFFICE)) +endif # support both LibreOffice and LibreOffice-still use/office/LibreOffice: use/office @$(call set,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)) # the complete lack of dependencies is intentional -use/office/LibreOffice/still: +use/office/LibreOffice/still: ; @: +ifneq (,$(filter-out e2k%,$(ARCH))) @$(call set,LO_FLAVOUR,-still) +endif use/office/LibreOffice/lang: use/office/LibreOffice @$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-langpack-kk)