From 28cb7e1d9451dcad331a0b2eabeb5477363d0dba7cc9bb85a7f5c11347520095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Thu, 22 Nov 2018 14:14:20 +0000 Subject: [PATCH] Accepting request 648239 from home:jengelh:branches:security:SELinux - Enable parallel build. Remove ineffective LDFLAGS="$RPM_LD_FLAGS" (RPM_LD_FLAGS is always empty). OBS-URL: https://build.opensuse.org/request/show/648239 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/checkpolicy?expand=0&rev=43 --- checkpolicy.changes | 6 ++++++ checkpolicy.spec | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/checkpolicy.changes b/checkpolicy.changes index 12618e7..98f2ee0 100644 --- a/checkpolicy.changes +++ b/checkpolicy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 11 17:19:04 UTC 2018 - Jan Engelhardt + +- Enable parallel build. Remove ineffective LDFLAGS="$RPM_LD_FLAGS" + (RPM_LD_FLAGS is always empty). + ------------------------------------------------------------------- Wed Nov 7 16:26:24 UTC 2018 - jsegitz@suse.com diff --git a/checkpolicy.spec b/checkpolicy.spec index 0108202..04a8533 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -70,15 +70,14 @@ to use checkpolicy from Python. %build make clean -make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" LDFLAGS="$RPM_LD_FLAGS" -(cd test -make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" LDFLAGS="$RPM_LD_FLAGS" ) +make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" %{?_smp_mflags} +make -C test LIBDIR="%{_libdir}" CFLAGS="%{optflags}" %{?_smp_mflags} %install -mkdir -p ${RPM_BUILD_ROOT}%{_bindir} -make LIBDIR="%{_libdir}" DESTDIR="${RPM_BUILD_ROOT}" install -install test/dismod ${RPM_BUILD_ROOT}%{_bindir}/sedismod -install test/dispol ${RPM_BUILD_ROOT}%{_bindir}/sedispol +mkdir -p %{buildroot}/%{_bindir} +%make_install LIBDIR="%{_libdir}" +install test/dismod %{buildroot}/%{_bindir}/sedismod +install test/dispol %{buildroot}/%{_bindir}/sedispol %files %defattr(-,root,root)