From 6dfd4a16e18a5c3d590d229b8f9fa3b0f360abdc Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Feb 2018 12:29:27 +0000 Subject: [PATCH] Use ninja to build --- glslang.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/glslang.spec b/glslang.spec index a3bb273..730f3c4 100644 --- a/glslang.spec +++ b/glslang.spec @@ -5,7 +5,7 @@ Name: glslang Version: 3.1 -Release: 0.4%{?gitrel}%{?dist} +Release: 0.5%{?gitrel}%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 @@ -17,6 +17,7 @@ Patch2: glslang_tests.patch BuildRequires: cmake3 BuildRequires: gcc-c++ +BuildRequires: ninja-build %description %{name} is the official reference compiler front end for the OpenGL @@ -42,12 +43,13 @@ find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x pushd build %cmake3 -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ - -DCMAKE_SKIP_RPATH:BOOL=yes .. -%{make_build} + -DCMAKE_SKIP_RPATH:BOOL=yes \ + -GNinja .. +%{ninja_build} popd %install -%{make_install} -C build +%{ninja_install} -C build %ifnarch s390x ppc64 %check @@ -76,6 +78,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/libglslang-default-resource-limits.a %changelog +* Fri Feb 09 2018 Leigh Scott - 3.1-0.5.20171028.git715c353 +- Use ninja to build + * Wed Feb 07 2018 Fedora Release Engineering - 3.1-0.4.20171028.git715c353 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild