(re)enable python, use ninja

workaround parallel-build failures in python bindings when using gnumake
epel8
Rex Dieter 7 years ago
parent 0402893a92
commit 9d22216b36

@ -5,14 +5,14 @@
%if !0%{?bootstrap}
%if 0%{?fedora} > 25
#global python 1
%global python 1
%endif
%global tests 1
%endif
Name: kf5-%{framework}
Version: 5.38.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
License: GPLv2+ and LGPLv2+ and MIT
@ -30,6 +30,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
## upstream patches
## upstreamable patches
BuildRequires: ninja-build
BuildRequires: extra-cmake-modules >= %{version}
BuildRequires: kf5-rpm-macros >= %{version}
@ -117,16 +118,17 @@ export PYTHONPATH
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kf5} .. \
%{cmake_kf5} -G Ninja .. \
%{?tests:-DBUILD_TESTING:BOOL=ON}
popd
make %{?_smp_mflags} -C %{_target_platform} -k ||
make -C %{_target_platform}
#make -C %{_target_platform}
%ninja_build -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
#make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%ninja_install -C %{_target_platform}
%find_lang %{name} --all-name --with-qt
@ -136,8 +138,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
export CTEST_OUTPUT_ON_FAILURE=1
xvfb-run -a \
dbus-launch --exit-with-session \
time \
make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
ninja test -v -C %{_target_platform} ||:
## cant use %%ninja_test here for some reason, doesn't inherit evn vars from xvfb or dbus -- rex
#make test ARGS="--output-on-failure --timeout 300"
%endif
@ -184,6 +188,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
%changelog
* Wed Sep 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.38.0-5
- (re)enable python, use ninja
* Wed Sep 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.38.0-4
- disable python, failing on arm7hl, aarch64, ppc64le archs

Loading…
Cancel
Save