Build using Ninja instead of Make
This commit is contained in:
parent
44b7022497
commit
c398201cad
21
json-c.spec
21
json-c.spec
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
Name: json-c
|
Name: json-c
|
||||||
Version: 0.14
|
Version: 0.14
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: JSON implementation in C
|
Summary: JSON implementation in C
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -42,7 +42,7 @@ Patch0005: %{url}/pull/619.patch#/%{name}-0.14-cmake_fix_out_of_tree_build_
|
|||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: make
|
BuildRequires: ninja-build
|
||||||
%ifarch %{valgrind_arches}
|
%ifarch %{valgrind_arches}
|
||||||
BuildRequires: valgrind
|
BuildRequires: valgrind
|
||||||
%endif
|
%endif
|
||||||
@ -88,13 +88,14 @@ mkdir -p %{_vpath_builddir}
|
|||||||
-DDISABLE_WERROR:BOOL=ON \
|
-DDISABLE_WERROR:BOOL=ON \
|
||||||
-DENABLE_RDRAND:BOOL=ON \
|
-DENABLE_RDRAND:BOOL=ON \
|
||||||
-DENABLE_THREADING:BOOL=ON \
|
-DENABLE_THREADING:BOOL=ON \
|
||||||
|
-G Ninja \
|
||||||
-B $PWD/%{_vpath_builddir} \
|
-B $PWD/%{_vpath_builddir} \
|
||||||
-S $PWD
|
-S $PWD
|
||||||
%make_build -C %{_vpath_builddir} all doc
|
%ninja_build -C %{_vpath_builddir} all doc
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install -C %{_vpath_builddir}
|
%ninja_install -C %{_vpath_builddir}
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
mkdir -p %{buildroot}%{_pkgdocdir}
|
mkdir -p %{buildroot}%{_pkgdocdir}
|
||||||
@ -103,10 +104,15 @@ cp -a %{_vpath_builddir}/doc/html ChangeLog README README.* \
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
USE_VALGRIND=0 %make_build -C %{_vpath_builddir} test
|
pushd %{_vpath_builddir}
|
||||||
|
export USE_VALGRIND=0
|
||||||
|
ctest %{_smp_mflags} --force-new-ctest-process --output-on-failure
|
||||||
%ifarch %{valgrind_arches}
|
%ifarch %{valgrind_arches}
|
||||||
USE_VALGRIND=1 %make_build -C %{_vpath_builddir} test
|
export USE_VALGRIND=1
|
||||||
|
ctest %{_smp_mflags} --force-new-ctest-process --output-on-failure
|
||||||
%endif
|
%endif
|
||||||
|
unset USE_VALGRIND
|
||||||
|
popd
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
@ -136,6 +142,9 @@ USE_VALGRIND=1 %make_build -C %{_vpath_builddir} test
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 26 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-6
|
||||||
|
- Build using Ninja instead of Make
|
||||||
|
|
||||||
* Mon May 25 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-5
|
* Mon May 25 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-5
|
||||||
- Run the testssuite with valgrind on %%valgrind_arches
|
- Run the testssuite with valgrind on %%valgrind_arches
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user