rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

limit -smp_mflags to -j16

Browse Source
This commit is contained in:
Dennis Gilmore 2009-02-16 17:07:41 +00:00
parent bc963527b9
commit e572a580b4
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
limit-smp-16-threads.patch Normal file
View File

@ -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.

32
redhat-rpm-config.spec
View File

@ -1,22 +1,28 @@
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.3 Version: 9.0.2
Release: 3%{?dist} Release: 2%{?dist}
# No version specified. 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: redhat-rpm-config-9.0.3-fix-requires.patch 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
# check buildroot
Conflicts: rpm-build < 4.4.2.1-0.4.rc2
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
# rpmrc passes -mtune which first appeared in gcc 3.4
%ifarch i386 i686 sparc
Conflicts: gcc < 3.4
%endif
%description %description
Red Hat specific rpm configuration files. Red Hat specific rpm configuration files.
%prep %prep
%setup -q %setup -q
%patch0 -p0 %patch0 -p1
%install %install
make DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=${RPM_BUILD_ROOT} install
@ -29,18 +35,8 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat %{_prefix}/lib/rpm/redhat
%changelog %changelog
* Wed Sep 3 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 9.0.3-3 * Tue May 20 2008 Dennis Gilmore <dennis@ausil.us> - 9.0.2-2
- fix license tag - limit smp to 16 threads
- nuke ancient conflicts
* Mon Aug 11 2008 Panu Matilainen <pmatilai@redhat.com> - 9.0.3-2
- Unbreak find-requires (#443015)
* Tue May 06 2008 Jon Masters <jcm@redhat.com> - 9.0.3-1
- Ensure Java Jar files have readable files within.
- Remove overwritten config.guess|sub files (testing).
- Fix Fortran flags for building using _fmoddir.
- Pull in objdump fix to upstream find-requires.
* 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