From d4ba753970bd2e8f708d39b72a23f112ae525531 Mon Sep 17 00:00:00 2001 From: zhangxianting Date: Fri, 28 Jun 2024 17:27:55 +0800 Subject: [PATCH] Fix build error at loongarch64 (cherry picked from commit 70f033a957fb62e0fff7fdd6285d2ac91f81bd98) --- ...4.patch => fix-build-on-riscv64-and-loongarch64.patch | 4 ++-- stb.spec | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) rename fix-build-on-riscv64.patch => fix-build-on-riscv64-and-loongarch64.patch (88%) diff --git a/fix-build-on-riscv64.patch b/fix-build-on-riscv64-and-loongarch64.patch similarity index 88% rename from fix-build-on-riscv64.patch rename to fix-build-on-riscv64-and-loongarch64.patch index 36559d1..745b775 100644 --- a/fix-build-on-riscv64.patch +++ b/fix-build-on-riscv64-and-loongarch64.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH] Fix stbsp__uintptr on riscv64 and loongarch64 --- stb_sprintf.h | 2 +- @@ -16,7 +16,7 @@ index ca432a6bca..2add83e2a5 100644 #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 ++#if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) || defined(__s390x__) || defined(__riscv) && __riscv_xlen == 64 || defined(__loongarch64) || defined(__loongarch64__) #define stbsp__uintptr stbsp__uint64 #else #define stbsp__uintptr stbsp__uint32 diff --git a/stb.spec b/stb.spec index 67d66b5..8fb5bc0 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.16 +Release: 0.17 Summary: Single-file public domain libraries for C/C++ # See LICENSE. @@ -233,9 +233,7 @@ Patch18: 0001-Fix-Null-pointer-dereference-because-of-an-uninitial.patch # https://github.com/nothings/stb/issues/1552 Patch19: 1553.patch -%ifarch riscv64 -Patch1000: fix-build-on-riscv64.patch -%endif +Patch1000: fix-build-on-riscv64-and-loongarch64.patch # Out of bounds heap buffer write (GHSL-2023-171/CVE-2023-45681) # https://github.com/nothings/stb/pull/1559 @@ -1001,6 +999,9 @@ EOF %changelog +* Fri Jun 28 2024 zhangxianting - 0.20220908git8b5f1f3-0.17 +- Fix build error at loongarch64 + * Wed May 08 2024 peijiankang - 0.20220908git8b5f1f3-0.16 - Patch for GHSL-2023-171/CVE-2023-45681/CVE-2023-47212 -- Gitee