pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/libfyaml
Module Name: pkgsrc
Committed By: tnn
Date: Wed Apr 1 08:53:14 UTC 2026
Modified Files:
pkgsrc/textproc/libfyaml: Makefile distinfo
Added Files:
pkgsrc/textproc/libfyaml/patches: patch-CMakeLists.txt
patch-include_libfyaml_libfyaml-util.h
patch-include_libfyaml_libfyaml-vlsize.h
Log Message:
libfyaml: try to fix 32-bit build & bump
The prior update is very broken on 32 bit targets.
This patchset rolls up the 32-bit fixes that looked
most relevant in the upstream repo committed after the release.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/libfyaml/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/libfyaml/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libfyaml/patches/patch-CMakeLists.txt \
pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-util.h \
pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-vlsize.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/libfyaml/Makefile
diff -u pkgsrc/textproc/libfyaml/Makefile:1.11 pkgsrc/textproc/libfyaml/Makefile:1.12
--- pkgsrc/textproc/libfyaml/Makefile:1.11 Thu Mar 26 13:58:33 2026
+++ pkgsrc/textproc/libfyaml/Makefile Wed Apr 1 08:53:14 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2026/03/26 13:58:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2026/04/01 08:53:14 tnn Exp $
DISTNAME= libfyaml-0.9.6
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=pantoniou/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}
Index: pkgsrc/textproc/libfyaml/distinfo
diff -u pkgsrc/textproc/libfyaml/distinfo:1.7 pkgsrc/textproc/libfyaml/distinfo:1.8
--- pkgsrc/textproc/libfyaml/distinfo:1.7 Thu Mar 26 13:58:33 2026
+++ pkgsrc/textproc/libfyaml/distinfo Wed Apr 1 08:53:14 2026
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.7 2026/03/26 13:58:33 wiz Exp $
+$NetBSD: distinfo,v 1.8 2026/04/01 08:53:14 tnn Exp $
BLAKE2s (libfyaml-0.9.6.tar.gz) = a5b4c5ea3dc0935b45a71345ed7bb60998a9f062887b598588034e02c2593672
SHA512 (libfyaml-0.9.6.tar.gz) = 71f01fdbfa8a3675bdd6697929bb8ee85672befa5ed815ef30813987c2f75f8ef0959e70d1b17d02ccadabc967f1dfd5b7f46a10a83fca7b1a9ed7455c52e344
Size (libfyaml-0.9.6.tar.gz) = 1146628 bytes
+SHA1 (patch-CMakeLists.txt) = 07f4012a4a84718134c6b13659eda0cc861a7efa
+SHA1 (patch-include_libfyaml_libfyaml-util.h) = 4318fa32aad5ffd22541c90580d90173c6394742
+SHA1 (patch-include_libfyaml_libfyaml-vlsize.h) = 8ac53eeaeb1ca93dea87ff2adf998d515fb40ca3
SHA1 (patch-src_lib_fy-walk.c) = 42156d0ec45256a8434ca2c95b97bf474553c02a
Added files:
Index: pkgsrc/textproc/libfyaml/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-CMakeLists.txt:1.1
--- /dev/null Wed Apr 1 08:53:14 2026
+++ pkgsrc/textproc/libfyaml/patches/patch-CMakeLists.txt Wed Apr 1 08:53:14 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2026/04/01 08:53:14 tnn Exp $
+
+https://github.com/pantoniou/libfyaml/commit/238082d09eb2453a9b6e98f359fb0eed05086694.patch
+
+--- CMakeLists.txt.orig 2026-03-15 13:48:50.000000000 +0000
++++ CMakeLists.txt
+@@ -606,7 +606,7 @@ set(TARGET_HAS_NEON FALSE)
+ # Use portable implementations instead
+ if(WIN32)
+ message(STATUS "Windows detected: using portable SIMD implementations")
+-elseif(TARGET_CPU_ANY_X86 AND NOT ENABLE_PORTABLE_TARGET)
++elseif(TARGET_CPU_X86_64 AND NOT ENABLE_PORTABLE_TARGET)
+ check_c_source_compiles("
+ #include <emmintrin.h>
+ int main() { __m128i a = _mm_setzero_si128(); return 0; }
Index: pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-util.h
diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-util.h:1.1
--- /dev/null Wed Apr 1 08:53:14 2026
+++ pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-util.h Wed Apr 1 08:53:14 2026
@@ -0,0 +1,34 @@
+$NetBSD: patch-include_libfyaml_libfyaml-util.h,v 1.1 2026/04/01 08:53:14 tnn Exp $
+
+https://github.com/pantoniou/libfyaml/commit/e7f1b117d458e202498f0a3862761661c26ca7ae.patch
+
+--- include/libfyaml/libfyaml-util.h.orig 2026-03-15 13:48:50.000000000 +0000
++++ include/libfyaml/libfyaml-util.h
+@@ -797,7 +797,11 @@ static inline char *fy_alloca_vsprintf_i
+ #define _E8(...) _E4(_E4(__VA_ARGS__))
+ #define _E16(...) _E8(_E8(__VA_ARGS__))
+ #define _E32(...) _E16(_E16(__VA_ARGS__))
++#if !defined(__SIZEOF_POINTER__) || __SIZEOF_POINTER__ >= 8
+ #define _E(...) _E32(_E32(__VA_ARGS__))
++#else
++#define _E(...) _E16(_E16(__VA_ARGS__))
++#endif
+
+ #define _FMT()
+ #define _FP1(m) m _FMT()
+@@ -1054,12 +1058,12 @@ static inline char *fy_alloca_vsprintf_i
+ #define FY_CPP_EVAL2(...) FY_CPP_EVAL1(FY_CPP_EVAL1(__VA_ARGS__))
+ #define FY_CPP_EVAL4(...) FY_CPP_EVAL2(FY_CPP_EVAL2(__VA_ARGS__))
+ #define FY_CPP_EVAL8(...) FY_CPP_EVAL4(FY_CPP_EVAL4(__VA_ARGS__))
+-#if !defined(__clang__)
+-// gcc is better, goes to 16
++#if !defined(__clang__) && (!defined(__SIZEOF_POINTER__) || __SIZEOF_POINTER__ >= 8)
++// 64-bit gcc can afford the deeper expansion tree.
+ #define FY_CPP_EVAL16(...) FY_CPP_EVAL8(FY_CPP_EVAL8(__VA_ARGS__))
+ #define FY_CPP_EVAL(...) FY_CPP_EVAL16(FY_CPP_EVAL16(__VA_ARGS__))
+ #else
+-// clang craps out at 8
++// clang and 32-bit builds use a shallower expansion tree to keep cc1 memory use in check.
+ #define FY_CPP_EVAL(...) FY_CPP_EVAL8(FY_CPP_EVAL8(__VA_ARGS__))
+ #endif
+
Index: pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-vlsize.h
diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-vlsize.h:1.1
--- /dev/null Wed Apr 1 08:53:14 2026
+++ pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml_libfyaml-vlsize.h Wed Apr 1 08:53:14 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-include_libfyaml_libfyaml-vlsize.h,v 1.1 2026/04/01 08:53:14 tnn Exp $
+
+https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.patch
+https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.patch
+
+--- include/libfyaml/libfyaml-vlsize.h.orig 2026-03-15 13:48:50.000000000 +0000
++++ include/libfyaml/libfyaml-vlsize.h
+@@ -810,13 +810,18 @@ fy_decode_size(const uint8_t *start, siz
+ 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 *
+ 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 *
Home |
Main Index |
Thread Index |
Old Index