!6 upgrade to 2023.2

From: @zhouwenpei 
Reviewed-by: @liangkeming 
Signed-off-by: @liangkeming
This commit is contained in:
openeuler-ci-bot 2023-07-31 09:54:37 +00:00 committed by Gitee
commit 2066a7c014
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 26 additions and 2 deletions

12
fix-gcc12-build.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp.dma ./SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp
--- SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp.dma 2022-02-16 08:20:38.927239298 +1000
+++ SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp 2022-02-16 08:20:42.262301854 +1000
@@ -397,6 +397,8 @@ std::string spvLogStringForEnv(spv_targe
return "Unknown";
}
+// workaround gcc12/stdlibc++ -Wrestrict bug.
+#pragma GCC diagnostic ignored "-Wrestrict"
std::string spvTargetEnvList(const int pad, const int wrap) {
std::string ret;
size_t max_line_len = wrap - pad; // The first line isn't padded

View File

@ -1,5 +1,5 @@
Name: spirv-tools
Version: 2022.1
Version: 2023.2
Release: 1
Summary: API and commands for processing SPIR-V modules
@ -7,6 +7,9 @@ License: ASL 2.0
URL: https://github.com/KhronosGroup/SPIRV-Tools
Source0: %url/archive/refs/tags/v%{version}.tar.gz
#patch from:https://src.fedoraproject.org/rpms/spirv-tools/blob/rawhide/f/fix-gcc12-build.patch
Patch6000: fix-gcc12-build.patch
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: ninja-build
@ -38,7 +41,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Development files for %{name}
%prep
%autosetup -p1 -n SPIRV-Tools-2022.1
%autosetup -p1 -n SPIRV-Tools-2023.2
%build
%__mkdir_p %_target_platform
@ -72,6 +75,7 @@ DESTDIR="%{buildroot}" %__cmake --install %_target_platform
%{_bindir}/spirv-val
%files libs
%{_libdir}/libSPIRV-Tools-diff.so
%{_libdir}/libSPIRV-Tools-link.so
%{_libdir}/libSPIRV-Tools-lint.so
%{_libdir}/libSPIRV-Tools-opt.so
@ -86,6 +90,9 @@ DESTDIR="%{buildroot}" %__cmake --install %_target_platform
%{_libdir}/pkgconfig/SPIRV-Tools.pc
%changelog
* Mon Jul 31 2023 zhouwenpei <zhouwenpei1@h-partners> - 2023.2-1
- update to 2023.2
* Mon Jul 25 2022 loong_C <loong_c@yeah.net> - 2022.1-1
- update to 2022.1

5
spirv-tools.yaml Normal file
View File

@ -0,0 +1,5 @@
version_control: github
src_repo: KhronosGroup/SPIRV-Tools
tag_prefix: ^v
seperator: "."

Binary file not shown.

BIN
v2023.2.tar.gz Normal file

Binary file not shown.