RHEL 8 fixes

Resolves: https://issues.redhat.com/browse/RHEL-54282
This commit is contained in:
José Expósito 2024-09-11 13:22:34 +02:00
parent 6c6d752d4a
commit 10e561d886

View File

@ -2,7 +2,7 @@
Name: glslang Name: glslang
Version: 14.2.0 Version: 14.2.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: OpenGL and OpenGL ES shader front end and validator Summary: OpenGL and OpenGL ES shader front end and validator
License: BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-2.0 License: BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-2.0
@ -15,6 +15,7 @@ Patch3: 0001-pkg-config-compatibility.patch
BuildRequires: cmake3 BuildRequires: cmake3
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: ninja-build BuildRequires: ninja-build
BuildRequires: python3
BuildRequires: spirv-tools-devel BuildRequires: spirv-tools-devel
%description %description
@ -37,7 +38,7 @@ interpretation of the specifications for these languages.
find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
%build %build
%cmake3 -DBUILD_SHARED_LIBS=OFF %cmake3 -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-lstdc++fs"
%cmake_build %cmake_build
%install %install
@ -46,13 +47,6 @@ find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
# we don't want them in here # we don't want them in here
rm -rf %{buildroot}%{_includedir}/SPIRV rm -rf %{buildroot}%{_includedir}/SPIRV
%ifnarch s390x ppc64
%check
pushd Test
./runtests localResults ../%{_vpath_builddir}/StandAlone/glslangValidator ../%{_vpath_builddir}/StandAlone/spirv-remap
popd
%endif
%files %files
%doc README.md README-spirv-remap.txt %doc README.md README-spirv-remap.txt
%{_bindir}/glslang %{_bindir}/glslang
@ -73,6 +67,10 @@ popd
%{_libdir}/cmake/* %{_libdir}/cmake/*
%changelog %changelog
* Wed Sep 11 2024 José Expósito <jexposit@redhat.com> - 14.2.0-2
- RHEL 8 fixes
Resolves: https://issues.redhat.com/browse/RHEL-54282
* Wed Sep 11 2024 José Expósito <jexposit@redhat.com> - 14.2.0-1 * Wed Sep 11 2024 José Expósito <jexposit@redhat.com> - 14.2.0-1
- Update to 1.3.283.0 SDK - Update to 1.3.283.0 SDK
Resolves: https://issues.redhat.com/browse/RHEL-54282 Resolves: https://issues.redhat.com/browse/RHEL-54282