limit smp_mflags to 16 when we use 32 we get things building out of order
This commit is contained in:
parent
e4599975bc
commit
6814bc69fb
|
@ -0,0 +1,13 @@
|
||||||
|
diff -Nur redhat-rpm-config-9.0.2-orig/macros redhat-rpm-config-9.0.2/macros
|
||||||
|
--- redhat-rpm-config-9.0.2-orig/macros 2008-04-03 02:14:54.000000000 -0500
|
||||||
|
+++ redhat-rpm-config-9.0.2/macros 2008-05-20 13:33:15.000000000 -0500
|
||||||
|
@@ -68,7 +68,8 @@
|
||||||
|
|
||||||
|
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
|
||||||
|
&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
|
||||||
|
- [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
|
||||||
|
+ if [ "$RPM_BUILD_NCPUS" -gt 16 ]; then echo "-j16"; \\\
|
||||||
|
+ elif [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi)
|
||||||
|
|
||||||
|
#==============================================================================
|
||||||
|
# ---- Build policy macros.
|
|
@ -1,10 +1,11 @@
|
||||||
Summary: Red Hat specific rpm configuration files.
|
Summary: Red Hat specific rpm configuration files.
|
||||||
Name: redhat-rpm-config
|
Name: redhat-rpm-config
|
||||||
Version: 9.0.2
|
Version: 9.0.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Development/System
|
Group: Development/System
|
||||||
Source: redhat-rpm-config-%{version}.tar.bz2
|
Source: redhat-rpm-config-%{version}.tar.bz2
|
||||||
|
Patch0: limit-smp-16-threads.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires: mktemp
|
Requires: mktemp
|
||||||
# if rpm-build is present (thus building rpms), we need newer for
|
# if rpm-build is present (thus building rpms), we need newer for
|
||||||
|
@ -21,6 +22,7 @@ Red Hat specific rpm configuration files.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
make DESTDIR=${RPM_BUILD_ROOT} install
|
||||||
|
@ -33,6 +35,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%{_prefix}/lib/rpm/redhat
|
%{_prefix}/lib/rpm/redhat
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 20 2008 Dennis Gilmore <dennis@ausil.us> - 9.0.2-2
|
||||||
|
- limit smp to 16 threads
|
||||||
|
|
||||||
* Thu Apr 03 2008 Jon Masters <jcm@redhat.com> - 9.0.2-1
|
* Thu Apr 03 2008 Jon Masters <jcm@redhat.com> - 9.0.2-1
|
||||||
- Remove smp dependencies
|
- Remove smp dependencies
|
||||||
- Update config.guess|sub files
|
- Update config.guess|sub files
|
||||||
|
|
Loading…
Reference in New Issue