[arch-commits] Commit in sysstat/repos/community-x86_64 (5 files)
Christian Rebischke
shibumi at archlinux.org
Sat Nov 7 15:24:48 UTC 2020
Date: Saturday, November 7, 2020 @ 15:24:48
Author: shibumi
Revision: 745871
archrelease: copy trunk to community-x86_64
Added:
sysstat/repos/community-x86_64/PKGBUILD
(from rev 745870, sysstat/trunk/PKGBUILD)
sysstat/repos/community-x86_64/fe7e338e20f5f533d460f9151eba20250857c350.patch
(from rev 745870, sysstat/trunk/fe7e338e20f5f533d460f9151eba20250857c350.patch)
sysstat/repos/community-x86_64/lib64-fix.patch
(from rev 745870, sysstat/trunk/lib64-fix.patch)
Deleted:
sysstat/repos/community-x86_64/PKGBUILD
sysstat/repos/community-x86_64/lib64-fix.patch
------------------------------------------------+
PKGBUILD | 99 +++++++++++------------
fe7e338e20f5f533d460f9151eba20250857c350.patch | 73 ++++++++++++++++
lib64-fix.patch | 50 +++++------
3 files changed, 148 insertions(+), 74 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-07 15:24:34 UTC (rev 745870)
+++ PKGBUILD 2020-11-07 15:24:48 UTC (rev 745871)
@@ -1,49 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Martin Devera <devik at cdi.cz>
-
-pkgname=sysstat
-pkgver=12.4.0
-pkgrel=1
-pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
-arch=('x86_64')
-url="http://pagesperso-orange.fr/sebastien.godard/"
-license=('GPL')
-depends=('lm_sensors')
-makedepends=('systemd')
-optdepends=('tk: to use isag'
- 'gnuplot: to use isag')
-options=('zipman')
-backup=('etc/conf.d/sysstat'
- 'etc/conf.d/sysstat.ioconf')
-source=("http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${pkgver}.tar.xz"
- 'lib64-fix.patch')
-sha512sums=('68314a50d3ab97c9e0cba27964b83cbc21bf08730a6ca9da655ecbeb574fc8fd83ea69038ec5c66a2b0bb367975f6cf45db840fe8dce69ddc64e64a35d6a1823'
- '46ec3eebb12232d30cddba60f16a57cd8d625513cf002d9e501797a6660f9da9cb4116ec81d0c292644fb6d91eb05c7be458da667260b238bcfef532a020b114')
-
-prepare() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- patch -p1 < "${srcdir}"/lib64-fix.patch
- autoreconf
-}
-
-build() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- conf_dir=/etc/conf.d ./configure --prefix=/usr \
- --enable-yesterday \
- --mandir=/usr/share/man \
- --enable-install-isag \
- --enable-install-cron \
- --enable-copy-only \
- --disable-man-group
- # patch makefile for FULL RELRO builds
- sed -e 's|CFLAGS = |CFLAGS += \$(CPPFLAGS) |' -e 's|LFLAGS = |LFLAGS = $(LDFLAGS) |' -i Makefile
- make
-}
-
-package() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- mkdir -p "${pkgdir}"/usr/lib/systemd/system
- make DESTDIR="${pkgdir}" install
- chown -R root:root "${pkgdir}"
- rm -rf "${pkgdir}"/etc/rc*
-}
Copied: sysstat/repos/community-x86_64/PKGBUILD (from rev 745870, sysstat/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-07 15:24:48 UTC (rev 745871)
@@ -0,0 +1,50 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Martin Devera <devik at cdi.cz>
+
+pkgname=sysstat
+pkgver=12.4.0
+pkgrel=2
+pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
+arch=('x86_64')
+url="http://pagesperso-orange.fr/sebastien.godard/"
+license=('GPL')
+depends=('lm_sensors')
+makedepends=('systemd')
+optdepends=('tk: to use isag'
+ 'gnuplot: to use isag')
+options=('zipman')
+backup=('etc/conf.d/sysstat'
+ 'etc/conf.d/sysstat.ioconf')
+source=("http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${pkgver}.tar.xz"
+ 'lib64-fix.patch'
+ 'fe7e338e20f5f533d460f9151eba20250857c350.patch')
+sha512sums=('68314a50d3ab97c9e0cba27964b83cbc21bf08730a6ca9da655ecbeb574fc8fd83ea69038ec5c66a2b0bb367975f6cf45db840fe8dce69ddc64e64a35d6a1823'
+ '46ec3eebb12232d30cddba60f16a57cd8d625513cf002d9e501797a6660f9da9cb4116ec81d0c292644fb6d91eb05c7be458da667260b238bcfef532a020b114'
+ 'ed6cb88e8036f9edc364a194b68b26829d70d40b60d4357cb15cd1b29c7583f563e2cc72f83bfd16e76cf0e08eea3095c035091bb848482ab4aa9e1e0200ff99')
+
+prepare() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ patch -p1 < "${srcdir}/lib64-fix.patch"
+ patch -p1 < "${srcdir}/fe7e338e20f5f533d460f9151eba20250857c350.patch"
+ autoreconf
+}
+
+build() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ conf_dir=/etc/conf.d ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --enable-install-cron \
+ --enable-copy-only \
+ --disable-compress-manpg
+ # patch makefile for FULL RELRO builds
+ sed -e 's|CFLAGS = |CFLAGS += \$(CPPFLAGS) |' -e 's|LFLAGS = |LFLAGS = $(LDFLAGS) |' -i Makefile
+ make
+}
+
+package() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ mkdir -p "${pkgdir}"/usr/lib/systemd/system
+ make DESTDIR="${pkgdir}" install
+ chown -R root:root "${pkgdir}"
+ rm -rf "${pkgdir}"/etc/rc*
+}
Copied: sysstat/repos/community-x86_64/fe7e338e20f5f533d460f9151eba20250857c350.patch (from rev 745870, sysstat/trunk/fe7e338e20f5f533d460f9151eba20250857c350.patch)
===================================================================
--- fe7e338e20f5f533d460f9151eba20250857c350.patch (rev 0)
+++ fe7e338e20f5f533d460f9151eba20250857c350.patch 2020-11-07 15:24:48 UTC (rev 745871)
@@ -0,0 +1,73 @@
+From fe7e338e20f5f533d460f9151eba20250857c350 Mon Sep 17 00:00:00 2001
+From: Sebastien GODARD <sysstat at users.noreply.github.com>
+Date: Mon, 24 Aug 2020 10:53:24 +0200
+Subject: [PATCH] Fix #272: --disable-compress-manpg option does not work
+
+Signed-off-by: Sebastien GODARD <sysstat at users.noreply.github.com>
+---
+ Makefile.in | 2 +-
+ configure | 9 ++++-----
+ configure.in | 5 ++---
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 4741ae4b..096e7eaf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -383,7 +383,7 @@ ifeq ($(INSTALL_DOC),y)
+ $(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR)
+ rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
+ $(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR)
+-ifeq ($(COMPRESS_MANPG),n)
++ifeq ($(COMPRESS_MANPG),y)
+ $(ZIP) $(DESTDIR)$(MAN8_DIR)/sa1.8
+ $(ZIP) $(DESTDIR)$(MAN8_DIR)/sa2.8
+ $(ZIP) $(DESTDIR)$(MAN8_DIR)/sadc.8
+diff --git a/configure b/configure
+index 51ceee60..c0e6b6b7 100755
+--- a/configure
++++ b/configure
+@@ -5346,18 +5346,17 @@ $as_echo "$AUX_IMG" >&6; }
+
+
+ # Compress manual pages?
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether manual pages should not be compressed" >&5
+-$as_echo_n "checking whether manual pages should not be compressed... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether manual pages should be compressed" >&5
++$as_echo_n "checking whether manual pages should be compressed... " >&6; }
+ # Check whether --enable-compress-manpg was given.
+ if test "${enable_compress_manpg+set}" = set; then :
+- enableval=$enable_compress_manpg; AUX_MPG=$enableval
++ enableval=$enable_compress_manpg; AUX_MPG=no
+ else
+- AUX_MPG=no
++ AUX_MPG=yes
+ fi
+
+ if test $AUX_MPG != "yes"; then
+ COMPRESS_MANPG=n
+- AUX_MPG=no
+ else
+ COMPRESS_MANPG=y
+ fi
+diff --git a/configure.in b/configure.in
+index b3d9b11d..b6ab705f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -492,14 +492,13 @@ AC_MSG_RESULT($AUX_IMG)
+ AC_SUBST(IGNORE_FILE_ATTRIBUTES)
+
+ # Compress manual pages?
+-AC_MSG_CHECKING(whether manual pages should not be compressed)
++AC_MSG_CHECKING(whether manual pages should be compressed)
+ AC_ARG_ENABLE(compress-manpg,
+ AC_HELP_STRING([--disable-compress-manpg],
+ [do not compress sysstat manual pages]),
+- AUX_MPG=$enableval,AUX_MPG=no)
++ AUX_MPG=no,AUX_MPG=yes)
+ if test $AUX_MPG != "yes"; then
+ COMPRESS_MANPG=n
+- AUX_MPG=no
+ else
+ COMPRESS_MANPG=y
+ fi
Deleted: lib64-fix.patch
===================================================================
--- lib64-fix.patch 2020-11-07 15:24:34 UTC (rev 745870)
+++ lib64-fix.patch 2020-11-07 15:24:48 UTC (rev 745871)
@@ -1,25 +0,0 @@
-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
-- # 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)
- AC_ARG_VAR([sa_lib_dir],[sadc directory])
Copied: sysstat/repos/community-x86_64/lib64-fix.patch (from rev 745870, sysstat/trunk/lib64-fix.patch)
===================================================================
--- lib64-fix.patch (rev 0)
+++ lib64-fix.patch 2020-11-07 15:24:48 UTC (rev 745871)
@@ -0,0 +1,25 @@
+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
+- # 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)
+ AC_ARG_VAR([sa_lib_dir],[sadc directory])
More information about the arch-commits
mailing list