Bug#1117633: ggml: please disable zicbop and zfh instructions on riscv64

[Aurelien Jarno <aurel32@debian.org>]

Source: ggml
Version: 0.9.4-1
Severity: important
Tags: patch
X-Debbugs-Cc: debian-riscv@lists.debian.org
User: debian-riscv@lists.debian.org
Usertags: riscv64
Control: affects -1 llama.cpp

Dear maintainer,

The new upstream version of ggml added support for zicbop and zfh
instructions on riscv64, enabled by default. As they are not part of our
baseline, this means they should be manually disabled in the
debian/rules file. This patch does that:

--- ggml-0.9.4/debian/rules
+++ ggml-0.9.4/debian/rules
@@ -38,7 +38,9 @@
 CMAKE_OPTS += -DGGML_CPU_ALL_VARIANTS=ON
 # Disable all features where all CPU variants are not supported
 else ifeq ($(DEB_HOST_ARCH),riscv64)
-CMAKE_OPTS += -DGGML_RVV=OFF
+CMAKE_OPTS += -DGGML_RVV=OFF \
+              -DGGML_RV_ZICBOP=OFF \
+              -DGGML_RV_ZFH=OFF
 else ifeq ($(DEB_HOST_ARCH),loong64)
 CMAKE_OPTS += -DGGML_LASX=OFF
 else ifeq ($(DEB_HOST_ARCH),s390x)


This fixes the build of llama.cpp on riscv64 against this ggml version.

Regards
Aurelien