osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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 <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2018-04-10 16:11:46 +02:00 committed by Anders Broman
parent 64f75a4ede
commit 0b7c6f03b0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/rpm/wireshark.spec.in
View File

@ -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