!48 [sync] PR-43: Fix build on riscv64
From: @openeuler-sync-bot Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
4e547df424
22
fix-build-on-riscv64.patch
Normal file
22
fix-build-on-riscv64.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
From 3cf93a58ad15d6d8a124dadca8fca3dbb2ea357c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eric Long <i@hack3r.moe>
|
||||||
|
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
|
||||||
9
stb.spec
9
stb.spec
@ -23,7 +23,7 @@ Name: stb
|
|||||||
# https://github.com/nothings/stb/issues/1101
|
# https://github.com/nothings/stb/issues/1101
|
||||||
%global snapinfo .20220908git8b5f1f3
|
%global snapinfo .20220908git8b5f1f3
|
||||||
Version: 0%{snapinfo}
|
Version: 0%{snapinfo}
|
||||||
Release: 0.13
|
Release: 0.14
|
||||||
Summary: Single-file public domain libraries for C/C++
|
Summary: Single-file public domain libraries for C/C++
|
||||||
|
|
||||||
# See LICENSE.
|
# See LICENSE.
|
||||||
@ -233,6 +233,10 @@ Patch: 0001-Fix-Null-pointer-dereference-because-of-an-uninitial.patch
|
|||||||
# https://github.com/nothings/stb/issues/1552
|
# https://github.com/nothings/stb/issues/1552
|
||||||
Patch: %{url}/pull/1553.patch
|
Patch: %{url}/pull/1553.patch
|
||||||
|
|
||||||
|
%ifarch riscv64
|
||||||
|
Patch1000: fix-build-on-riscv64.patch
|
||||||
|
%endif
|
||||||
|
|
||||||
%global stb_c_lexer_version 0.12
|
%global stb_c_lexer_version 0.12
|
||||||
%global stb_connected_components_version 0.96
|
%global stb_connected_components_version 0.96
|
||||||
%global stb_c_lexer_version 0.12
|
%global stb_c_lexer_version 0.12
|
||||||
@ -990,6 +994,9 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 22 2024 misaka00251 <liuxin@iscas.ac.cn> - 0.20220908git8b5f1f3-0.14
|
||||||
|
- Fix build on riscv64
|
||||||
|
|
||||||
* Fri Mar 08 2024 peijiankang <peijiankang@kylinos.cn> - 0.20220908git8b5f1f3-0.13
|
* Fri Mar 08 2024 peijiankang <peijiankang@kylinos.cn> - 0.20220908git8b5f1f3-0.13
|
||||||
- stb_vorbis: fix GHSL-2023-165 / fix CVE-2023-45675
|
- stb_vorbis: fix GHSL-2023-165 / fix CVE-2023-45675
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user