From 7fd1677f699c4868e18084c9eb2b113f8f68e1af Mon Sep 17 00:00:00 2001 From: misaka00251 Date: Fri, 22 Mar 2024 19:50:49 +0800 Subject: [PATCH] Fix build on riscv64 (cherry picked from commit 2cc0e481f943c3e5825c5446432dd0858bb6f91e) --- fix-build-on-riscv64.patch | 22 ++++++++++++++++++++++ stb.spec | 9 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 fix-build-on-riscv64.patch diff --git a/fix-build-on-riscv64.patch b/fix-build-on-riscv64.patch new file mode 100644 index 0000000..a90f47d --- /dev/null +++ b/fix-build-on-riscv64.patch @@ -0,0 +1,22 @@ +From 3cf93a58ad15d6d8a124dadca8fca3dbb2ea357c Mon Sep 17 00:00:00 2001 +From: Eric Long +Date: Sat, 23 Sep 2023 22:43:11 +0800 +Subject: [PATCH] Fix stbsp__uintptr on riscv64 + +--- + stb_sprintf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stb_sprintf.h b/stb_sprintf.h +index ca432a6bca..2add83e2a5 100644 +--- a/stb_sprintf.h ++++ b/stb_sprintf.h +@@ -230,7 +230,7 @@ STBSP__PUBLICDEC void STB_SPRINTF_DECORATE(set_separators)(char comma, char peri + #define stbsp__uint16 unsigned short + + #ifndef stbsp__uintptr +-#if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) || defined(__s390x__) ++#if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) || defined(__s390x__) || defined(__riscv) && __riscv_xlen == 64 + #define stbsp__uintptr stbsp__uint64 + #else + #define stbsp__uintptr stbsp__uint32 \ No newline at end of file diff --git a/stb.spec b/stb.spec index 2fa1700..09dc57a 100644 --- a/stb.spec +++ b/stb.spec @@ -23,7 +23,7 @@ Name: stb # https://github.com/nothings/stb/issues/1101 %global snapinfo .20220908git8b5f1f3 Version: 0%{snapinfo} -Release: 0.13 +Release: 0.14 Summary: Single-file public domain libraries for C/C++ # See LICENSE. @@ -233,6 +233,10 @@ Patch: 0001-Fix-Null-pointer-dereference-because-of-an-uninitial.patch # https://github.com/nothings/stb/issues/1552 Patch: %{url}/pull/1553.patch +%ifarch riscv64 +Patch1000: fix-build-on-riscv64.patch +%endif + %global stb_c_lexer_version 0.12 %global stb_connected_components_version 0.96 %global stb_c_lexer_version 0.12 @@ -990,6 +994,9 @@ EOF %changelog +* Fri Mar 22 2024 misaka00251 - 0.20220908git8b5f1f3-0.14 +- Fix build on riscv64 + * Fri Mar 08 2024 peijiankang - 0.20220908git8b5f1f3-0.13 - stb_vorbis: fix GHSL-2023-165 / fix CVE-2023-45675 -- Gitee