RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 10-Apr-2008 11:00:05
Branch: HEAD Handle: 2008041009000300
Modified files:
rpm CHANGES macros.in
Log:
proyvind: improve %_smp_mflags so that it will correctly detect number
of cpus on macos, while defaulting to 1 cpu if unable to detect
Summary:
Revision Changes Path
1.2292 +1 -0 rpm/CHANGES
1.243 +4 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2291 -r1.2292 CHANGES
--- rpm/CHANGES 10 Apr 2008 07:49:16 -0000 1.2291
+++ rpm/CHANGES 10 Apr 2008 09:00:03 -0000 1.2292
@@ -1,5 +1,6 @@
5.1b1 -> 5.2b1
+ - proyvind: improve %_smp_mflags so that it will correctly detect number
of cpus on macos, while defaulting to 1 cpu if unable to detect
- proyvind: move some macros that's identical for each platform macros
to standard macros
- rse: use latest POPT 1.14 for building with "devtool standalone"
- rse: prepared build-tree for RPM 5.2 development after branching
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.242 -r1.243 macros.in
--- rpm/macros.in 10 Apr 2008 07:49:16 -0000 1.242
+++ rpm/macros.in 10 Apr 2008 09:00:03 -0000 1.243
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.242 2008/04/10 07:49:16 pkarlsen Exp $
+# $Id: macros.in,v 1.243 2008/04/10 09:00:03 pkarlsen Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -1290,7 +1290,9 @@
%_initrddir %{_sysconfdir}/rc.d/init.d
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
- && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
+ && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null`";
\\\
+ [ -z "$RPM_BUILD_NCPUS" ] && RPM_BUILD_NCPUS="`/usr/sbin/sysctl -n
hw.ncpu 2> /dev/null`"; \\\
+ [ -z "$RPM_BUILD_NCPUS" ] && RPM_BUILD_NCPUS="1"; \\\
[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
#---------------------------------------------------------------------
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
