RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   17-Oct-2013 21:34:01
  Branch: rpm-5_4                          Handle: 2013101719340000

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES configure.ac

  Log:
    - mooney: solaris needs additional eval configuring NCPUS
    (lp#1240717).

  Summary:
    Revision    Changes     Path
    1.3501.2.349+1  -0      rpm/CHANGES
    2.472.2.94  +1  -1      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.348 -r1.3501.2.349 CHANGES
  --- rpm/CHANGES       17 Oct 2013 19:10:38 -0000      1.3501.2.348
  +++ rpm/CHANGES       17 Oct 2013 19:34:00 -0000      1.3501.2.349
  @@ -1,4 +1,5 @@
   5.4.13 -> 5.4.14:
  +    - mooney: solaris needs additional eval configuring NCPUS (lp#1240717).
       - jbj: i18n: update PO files (Translation Project).
       - jbj: c++: add minimal necessary hackery to compile/use rpmqv.cc. 
todo++.
       - mooney: fix: ensure endian definitions on endian.h challenged 
platforms.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.472.2.93 -r2.472.2.94 configure.ac
  --- rpm/configure.ac  17 Oct 2013 19:24:31 -0000      2.472.2.93
  +++ rpm/configure.ac  17 Oct 2013 19:34:00 -0000      2.472.2.94
  @@ -2211,7 +2211,7 @@
       *-*-solaris* ) NCPUS_COMMAND="psrinfo | egrep 'on-line' | wc -l  | sed 
-e 's+^ *++'" ;;
       *-*-darwin* ) NCPUS_COMMAND="/usr/sbin/sysctl -n hw.ncpu" ;;
   esac
  -NCPUS_RESULT=`$NCPUS_COMMAND`
  +NCPUS_RESULT=`eval $NCPUS_COMMAND`
   AC_MSG_RESULT([`$NCPUS_COMMAND` ($NCPUS_RESULT)])
   AC_SUBST(NCPUS_COMMAND)
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to