From abbd7868a0982361179e9a6f6860a877edcd7a54 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 2 Sep 2026 08:44:35 +0900 Subject: gnu: libfyaml: Fix build on 32bit architectures. * gnu/packages/patches/libfyaml-vlsize-32bit-fixes.patch: New file. * gnu/packages/serialization.scm (libfyaml) [source]: Apply patch. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../patches/libfyaml-vlsize-32bit-fixes.patch | 36 ++++++++++++++++++++++ gnu/packages/serialization.scm | 3 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libfyaml-vlsize-32bit-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2728cbc2e87..1a8720459de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1805,6 +1805,7 @@ dist_patch_DATA = \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-use-provided-catch2.patch \ %D%/packages/patches/libfaketime-32bit.patch \ + %D%/packages/patches/libfyaml-vlsize-32bit-fixes.patch \ %D%/packages/patches/libgda-CVE-2021-39359.patch \ %D%/packages/patches/libgda-disable-data-proxy-test.patch \ %D%/packages/patches/libgda-fix-build.patch \ diff --git a/gnu/packages/patches/libfyaml-vlsize-32bit-fixes.patch b/gnu/packages/patches/libfyaml-vlsize-32bit-fixes.patch new file mode 100644 index 00000000000..90d388a74da --- /dev/null +++ b/gnu/packages/patches/libfyaml-vlsize-32bit-fixes.patch @@ -0,0 +1,36 @@ +Combined diffs of commits https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.diff and https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.diff. + +Upstream-status: + +diff --git a/include/libfyaml/libfyaml-vlsize.h b/include/libfyaml/libfyaml-vlsize.h +index 6ccb7ab1..1b950c4c 100644 +--- a/include/libfyaml/libfyaml-vlsize.h ++++ b/include/libfyaml/libfyaml-vlsize.h +@@ -816,5 +816,5 @@ fy_decode_size_nocheck(const uint8_t *start, size_t *sizep) + static inline const uint8_t * + fy_skip_size(const uint8_t *start, size_t bufsz) + { +- return fy_skip_size32(start, bufsz, &sz); ++ return fy_skip_size32(start, bufsz); + } + + static inline const uint8_t * + +diff --git a/include/libfyaml/libfyaml-vlsize.h b/include/libfyaml/libfyaml-vlsize.h +index 1b950c4c..acfd78d3 100644 +--- a/include/libfyaml/libfyaml-vlsize.h ++++ b/include/libfyaml/libfyaml-vlsize.h +@@ -810,5 +810,10 @@ fy_decode_size(const uint8_t *start, size_t bufsz, size_t *sizep) + static inline const uint8_t * + fy_decode_size_nocheck(const uint8_t *start, size_t *sizep) + { +- return fy_decode_size32_nocheck(start, sizep); ++ uint64_t sz; ++ const uint8_t *ret; ++ ++ ret = fy_decode_size32_nocheck(start, &sz); ++ *sizep = (size_t)sz; ++ return ret; + } + + static inline const uint8_t * diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 06166d825ad..7571ef2b0c7 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -482,7 +482,8 @@ in which the loaded data is arranged in memory.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hrp1vaa1f192krrvkmmfr9rsladzpm5jgxjzpnx5hkrw9xi054r")))) + (base32 "1hrp1vaa1f192krrvkmmfr9rsladzpm5jgxjzpnx5hkrw9xi054r")) + (patches (search-patches "libfyaml-vlsize-32bit-fixes.patch")))) (build-system gnu-build-system) (native-inputs (list autoconf -- cgit v1.2.3