[arch-commits] Commit in sysstat/trunk (PKGBUILD lib64-fix.patch)

[Sergej Pupykin]

    Date: Monday, February 16, 2015 @ 11:32:56
  Author: spupykin
Revision: 127791

upgpkg: sysstat 11.1.3-1

upd

Modified:
  sysstat/trunk/PKGBUILD
  sysstat/trunk/lib64-fix.patch

-----------------+
 PKGBUILD        |    8 ++++----
 lib64-fix.patch |   26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-16 10:22:37 UTC (rev 127790)
+++ PKGBUILD	2015-02-16 10:32:56 UTC (rev 127791)
@@ -3,8 +3,8 @@
 # Contributor: Martin Devera <devik at cdi.cz>
 
 pkgname=sysstat
-pkgver=11.0.0
-pkgrel=2
+pkgver=11.1.3
+pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -18,8 +18,8 @@
 	'etc/conf.d/sysstat.ioconf')
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	lib64-fix.patch)
-md5sums=('fbd773ae95d0d055011496dc1cef99e5'
-         '7ffa6bf990609d85367070f71b40a34b')
+md5sums=('de4d6f2d484d56d17d09a25fcec77dbc'
+         '5c7acc9a31b7724b8815daffae219de1')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver

Modified: lib64-fix.patch
===================================================================
--- lib64-fix.patch	2015-02-16 10:22:37 UTC (rev 127790)
+++ lib64-fix.patch	2015-02-16 10:32:56 UTC (rev 127791)
@@ -1,16 +1,24 @@
-diff -wbBur sysstat-10.1.6.q/configure.in sysstat-10.1.6/configure.in
---- sysstat-10.1.6.q/configure.in	2013-04-21 18:20:32.000000000 +0400
-+++ sysstat-10.1.6/configure.in	2013-06-17 14:45:41.733915298 +0400
-@@ -207,13 +207,6 @@
+diff -wbBur sysstat-11.1.3.org/configure.in sysstat-11.1.3/configure.in
+--- sysstat-11.1.3.org/configure.in	2015-02-13 17:05:44.000000000 +0300
++++ sysstat-11.1.3/configure.in	2015-02-16 13:25:26.201405593 +0300
+@@ -209,21 +209,6 @@
  fi
  
  SADC_DIR=$AuxPrefix/lib
 -if test -d $AuxPrefix/lib64; then
--   # Look for lm (long mode) flag to know if CPU is 64 bit
--   grep " lm " /proc/cpuinfo >/dev/null 2>&1
--   if test $? = 0; then
--      SADC_DIR=$AuxPrefix/lib64
--   fi
+-    # Verify that this OS is really 64 bit
+-    BITS=$(getconf LONG_BIT 2>/dev/null)
+-    if test $? = 0; then
+-        if test $BITS = 64; then
+-            SADC_DIR=$AuxPrefix/lib64
+-        fi
+-    else
+-        # Fallback: look for lm (long mode) flag to know if CPU is 64 bit
+-        grep " lm " /proc/cpuinfo >/dev/null 2>&1
+-        if test $? = 0; then
+-            SADC_DIR=$AuxPrefix/lib64
+-        fi
+-    fi
 -fi
  
  AC_MSG_CHECKING(sadc directory)