From 0b7c6f03b0f1c2737a16b68c9f689e373bd83b80 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 10 Apr 2018 16:11:46 +0200 Subject: RPM: support multiple ninja executables. Support ninja and ninja-build (Centos7) so far. Change-Id: I846a0645f24f6cfdc83bd725827d1681a5a1f174 Reviewed-on: https://code.wireshark.org/review/26856 Reviewed-by: Anders Broman --- packaging/rpm/wireshark.spec.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'packaging/rpm') diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index eec0f9b80a..455a94ab1a 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -261,7 +261,11 @@ Requires: libmaxminddb . %if %{with ninja} -ninja +NINJA=$(which ninja || which ninja-build) +%endif + +%if %{with ninja} +$NINJA %else # Suggestion: put this in your ~/.rpmmacros (without the hash sign, of course): # %_smp_mflags -j %(grep -c processor /proc/cpuinfo) @@ -271,8 +275,8 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %if %{with ninja} -DESTDIR=$RPM_BUILD_ROOT ninja install -DESTDIR=$RPM_BUILD_ROOT ninja install_guides +DESTDIR=$RPM_BUILD_ROOT $NINJA install +DESTDIR=$RPM_BUILD_ROOT $NINJA install_guides %else make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install_guides -- cgit v1.2.3