use/office: LibreOffice is availiable on riscv64

Now LibreOffice is availalbe in sisyphus_riscv64, let's use it like all the other platforms do. Note that LibreOffice-still is not yet available in sisyphus_riscv64, so riscv64 joins e2k in selecting LibreOffice for use/office/LibreOffice/still.

use/office: LibreOffice is availiable on riscv64
ae211d09 · Ivan A. Melnikov · d55c0985 · ae211d09
Commit ae211d09 authored Dec 02, 2022 by Ivan A. Melnikov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

config.mk features.in/office/config.mk +1 -8

No files found.
--- a/features.in/office/config.mk
+++ b/features.in/office/config.mk
@@ -3,18 +3,13 @@ use/office:
 	@$(call try,THE_OFFICE,abiword gnumeric)
 	@$(call add,THE_PACKAGES,$$(THE_OFFICE))

-ifeq (,$(filter-out riscv64,$(ARCH)))
-# other office not available on riscv64 at the moment
-use/office/%: use/office; @:
-else
-
 # 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: ; @:
-ifneq (,$(filter-out e2k%,$(ARCH)))
+ifneq (,$(filter-out riscv64 e2k%,$(ARCH)))
 	@$(call set,LO_FLAVOUR,-still)
 endif

@@ -42,5 +37,3 @@ use/office/LibreOffice/full: use/office/LibreOffice/still \

 use/office/calligra: use/office
 	@$(call set,THE_OFFICE,calligra)
-
-endif	# !riscv64