From 20a0e63249431663e7bb85898366cfdd078e32f2 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 15 Jan 2019 12:02:22 +0200 Subject: [PATCH] Drop redundant _smp_mflag re-definition, use the one from rpm instead Once upon a time these did differ (for various bad reasons) but the version in rpm has been identical to ours for many years, lets shed some old baggage. --- macros | 13 ------------- redhat-rpm-config.spec | 5 ++++- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/macros b/macros index 5f083ce..3fe9244 100644 --- a/macros +++ b/macros @@ -117,19 +117,6 @@ print(result) --mandir=%{_mandir} \\\ --infodir=%{_infodir} -# Maximum number of CPU's to use when building, 0 for unlimited. -# -# This was for some time capped at 16. Please see -# https://bugzilla.redhat.com/show_bug.cgi?id=669638 and -# https://bugzilla.redhat.com/show_bug.cgi?id=1384938 for the situation -# surrounding this. -#%_smp_ncpus_max 0 -%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\ - && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ - ncpus_max=%{?_smp_ncpus_max}; \\\ - if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [ "$RPM_BUILD_NCPUS" -gt "$ncpus_max" ]; then RPM_BUILD_NCPUS="$ncpus_max"; fi; \\\ - if [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi) - #============================================================================== # ---- Build policy macros. # diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 64b1674..8685873 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 127 +Version: 128 Release: 1%{?dist} # No version specified. License: GPL+ @@ -199,6 +199,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Jan 15 2019 Panu Matilainen - 128-1 +- Drop redundant _smp_mflag re-definition, use the one from rpm instead + * Thu Dec 20 2018 Florian Weimer - 127-1 - Build flags: Add support for extension builders (#1543394)