From 44f825d7cd61e899e247e91071b644012b2eef41 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 9 May 2025 14:58:35 +0200 Subject: [PATCH] jsonnet: update to 0.21.0. --- .../patches/fix-build-non-x86-arm.patch | 27 ------------------- srcpkgs/jsonnet/patches/fix-ppc-be.patch | 22 --------------- srcpkgs/jsonnet/template | 4 +-- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/jsonnet/patches/fix-build-non-x86-arm.patch delete mode 100644 srcpkgs/jsonnet/patches/fix-ppc-be.patch diff --git a/srcpkgs/jsonnet/patches/fix-build-non-x86-arm.patch b/srcpkgs/jsonnet/patches/fix-build-non-x86-arm.patch deleted file mode 100644 index fc899d74a6d..00000000000 --- a/srcpkgs/jsonnet/patches/fix-build-non-x86-arm.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 9d1ebbeb750a790e0df045bf24ea2181a6ba3cf7 -Author: q66 -Date: Thu Jan 6 17:06:34 2022 +0100 - - error: 'trap_instruction' was not declared in this scope - -diff --git a/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/debugbreak/debugbreak.h b/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/debugbreak/debugbreak.h -index f570bf8..9c5fc2c 100644 ---- a/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/debugbreak/debugbreak.h -+++ b/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/debugbreak/debugbreak.h -@@ -102,13 +102,16 @@ __inline__ static void trap_instruction(void) - } - #else - enum { HAVE_TRAP_INSTRUCTION = 0, }; -+#define NO_TRAP_INSTRUCTION 1 - #endif - - __attribute__((gnu_inline, always_inline)) - __inline__ static void debug_break(void) - { - if (HAVE_TRAP_INSTRUCTION) { -+#ifndef NO_TRAP_INSTRUCTION - trap_instruction(); -+#endif - } else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) { - /* raises SIGILL on Linux x86{,-64}, to continue in gdb: - * (gdb) handle SIGILL stop nopass diff --git a/srcpkgs/jsonnet/patches/fix-ppc-be.patch b/srcpkgs/jsonnet/patches/fix-ppc-be.patch deleted file mode 100644 index 4ebbaddeadb..00000000000 --- a/srcpkgs/jsonnet/patches/fix-ppc-be.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h -+++ b/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h -@@ -9,10 +9,12 @@ - || defined(__amd64) || defined(__aarch64__) || defined(_M_ARM64) \ - || defined(__MINGW64__) \ - || defined(__s390x__) \ -+ || defined(__powerpc64__) \ - || (defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__))) - #define FASTFLOAT_64BIT - #elif (defined(__i386) || defined(__i386__) || defined(_M_IX86) \ - || defined(__arm__) \ -+ || defined(__powerpc__) \ - || defined(__MINGW32__)) - #define FASTFLOAT_32BIT - #else -@@ -337,4 +339,4 @@ inline OStream& operator<<(OStream &out, const fast_float::decimal &d) { - return out; - } - --#endif -\ No newline at end of file -+#endif diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template index cb41f5f19d9..9afd150532d 100644 --- a/srcpkgs/jsonnet/template +++ b/srcpkgs/jsonnet/template @@ -1,6 +1,6 @@ # Template file for 'jsonnet' pkgname=jsonnet -version=0.20.0 +version=0.21.0 revision=1 build_style=gnu-makefile make_use_env=true @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/google/jsonnet" distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz" -checksum=77bd269073807731f6b11ff8d7c03e9065aafb8e4d038935deb388325e52511b +checksum=a12ebca72e43e7061ffe4ef910e572b95edd7778a543d6bf85f6355bd290300e CXXFLAGS="-fPIC"