From fe7183021f0c11acb49a4808b46d73e55dbd2a10 Mon Sep 17 00:00:00 2001 From: "riseproject-dev[bot]" <330740410+riseproject-dev[bot]@users.noreply.github.com> Date: Sun, 27 Sep 2026 07:40:52 +0000 Subject: [PATCH 1/2] cvc5: Add versions 1.4.0, 1.4.1 Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> --- docs/packages/cvc5.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/packages/cvc5.yaml b/docs/packages/cvc5.yaml index 456569dcef5..4bce1dba24a 100644 --- a/docs/packages/cvc5.yaml +++ b/docs/packages/cvc5.yaml @@ -13,3 +13,5 @@ versions: sha256: 334647363877836d0009ab59079e8fe32d76d208b0bcff2ed369b95b0a9bf143 - filename: cvc5-1.3.4-cp314-cp314-manylinux_2_39_riscv64.whl sha256: 4b0cbd3ee8b716e3331e17710f9aca8c507993f82de0fd434784414c6c6e793c +- version: 1.4.0 +- version: 1.4.1 From a3d580980b053751d8c28d321f4f5df5f594b479 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sun, 27 Sep 2026 09:14:12 +0000 Subject: [PATCH 2/2] cvc5: Carry the GMP build-triplet patch forward to 1.4.0, 1.4.1 cmake/Helpers.cmake on both tags still maps only x86_64 and aarch64 to a "-linux-gnu" BUILD_TRIPLET, so the 1.3.4 patch is needed unchanged and applies cleanly to both. --- ...v64-to-a-Linux-build-triplet-for-GMP.patch | 35 +++++++++++++++++++ ...v64-to-a-Linux-build-triplet-for-GMP.patch | 35 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 patches/cvc5/1.4.0/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch create mode 100644 patches/cvc5/1.4.1/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch diff --git a/patches/cvc5/1.4.0/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch b/patches/cvc5/1.4.0/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch new file mode 100644 index 00000000000..3a8e33e73e5 --- /dev/null +++ b/patches/cvc5/1.4.0/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ludovic Henry +Date: Fri, 25 Sep 2026 00:00:00 +0000 +Subject: [PATCH] Map riscv64 to a Linux build triplet for GMP + +BUILD_TRIPLET is handed to GMP's configure as --build, and only x86_64 +and aarch64 get a full "-linux-gnu" triplet. On riscv64 it falls +back to the bare CMAKE_HOST_SYSTEM_PROCESSOR, which GMP's config.sub +canonicalises to "riscv64-unknown-none". libtool knows no dynamic linker +for host_os "none", so GMP's configure answers "whether to build shared +libraries... no" and produces only libgmp.a, while the default +BUILD_SHARED_LIBS build links against deps/lib/libgmp.so. + +Give riscv64 the same treatment as aarch64. With riscv64-linux-gnu GMP +still selects its mpn/riscv/64 assembly and builds libgmp.so. + +Upstream-Status: To upstream [not yet submitted; cmake/Helpers.cmake on cvc5 main still has no riscv64 branch] + +Signed-off-by: Ludovic Henry +--- +diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake +index 25c86dc3a..c0156862c 100644 +--- a/cmake/Helpers.cmake ++++ b/cmake/Helpers.cmake +@@ -34,6 +34,8 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(BUILD_TRIPLET "x86_64-linux-gnu") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") + set(BUILD_TRIPLET "aarch64-linux-gnu") ++ elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "riscv64") ++ set(BUILD_TRIPLET "riscv64-linux-gnu") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") +-- +2.43.0 diff --git a/patches/cvc5/1.4.1/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch b/patches/cvc5/1.4.1/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch new file mode 100644 index 00000000000..3a8e33e73e5 --- /dev/null +++ b/patches/cvc5/1.4.1/0001-Map-riscv64-to-a-Linux-build-triplet-for-GMP.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ludovic Henry +Date: Fri, 25 Sep 2026 00:00:00 +0000 +Subject: [PATCH] Map riscv64 to a Linux build triplet for GMP + +BUILD_TRIPLET is handed to GMP's configure as --build, and only x86_64 +and aarch64 get a full "-linux-gnu" triplet. On riscv64 it falls +back to the bare CMAKE_HOST_SYSTEM_PROCESSOR, which GMP's config.sub +canonicalises to "riscv64-unknown-none". libtool knows no dynamic linker +for host_os "none", so GMP's configure answers "whether to build shared +libraries... no" and produces only libgmp.a, while the default +BUILD_SHARED_LIBS build links against deps/lib/libgmp.so. + +Give riscv64 the same treatment as aarch64. With riscv64-linux-gnu GMP +still selects its mpn/riscv/64 assembly and builds libgmp.so. + +Upstream-Status: To upstream [not yet submitted; cmake/Helpers.cmake on cvc5 main still has no riscv64 branch] + +Signed-off-by: Ludovic Henry +--- +diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake +index 25c86dc3a..c0156862c 100644 +--- a/cmake/Helpers.cmake ++++ b/cmake/Helpers.cmake +@@ -34,6 +34,8 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(BUILD_TRIPLET "x86_64-linux-gnu") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") + set(BUILD_TRIPLET "aarch64-linux-gnu") ++ elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "riscv64") ++ set(BUILD_TRIPLET "riscv64-linux-gnu") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") +-- +2.43.0