From: Tomas Krizek Date: Mon, 25 Feb 2019 15:59:17 +0000 (+0100) Subject: distro/rpm: use ninja op opensuse X-Git-Tag: v4.0.0~24^2~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df9fc51d13c49b8dd2ede5ca19e8333428f8550;p=thirdparty%2Fknot-resolver.git distro/rpm: use ninja op opensuse --- diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec index c2b76e38a..45dda33e5 100644 --- a/distro/rpm/knot-resolver.spec +++ b/distro/rpm/knot-resolver.spec @@ -4,6 +4,7 @@ %define GPG_CHECK 0 %define VERSION __VERSION__ %define repodir %{_builddir}/%{name}-%{version} +%define NINJA ninja-build Name: knot-resolver Version: %{VERSION} @@ -65,6 +66,7 @@ Requires: lua-cqueues-compat Requires(pre): shadow-utils %endif %if 0%{?suse_version} +%define NINJA ninja BuildRequires: lmdb-devel BuildRequires: python3-Sphinx Requires: lua51-luasocket @@ -137,16 +139,16 @@ meson build_rpm \ -Dc_args="%{optflags}"\ -Dc_link_args="%{?__global_ldflags}" -ninja-build -v -C build_rpm +%{NINJA} -v -C build_rpm %if "x%{?rhel}" == "x" -ninja-build -v -C build_rpm doc +%{NINJA} -v -C build_rpm doc %endif %check meson test -C build_rpm %install -DESTDIR="${RPM_BUILD_ROOT}" ninja-build -v -C build_rpm install +DESTDIR="${RPM_BUILD_ROOT}" %{NINJA} -v -C build_rpm install # add kresd.target to multi-user.target.wants to support enabling kresd services install -m 0755 -d %{buildroot}%{_unitdir}/multi-user.target.wants