sysstat: bump to 9.1.6, fix libintl problems

Closes #759

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 0d672024670f6ff7b7b5914abb098ce9d76a09c1..1cfe3b194e44b7206fcda19b9be32ec52aae508b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,10 +4,11 @@
 
        Updated/fixed packages: bash, bind, busybox, libglib2, libmad,
        midori, module-init-tools, mtd-utils, openssh, pciutils, qt,
-       sqlite, webkit
+       sqlite, sysstat, webkit
 
        Issues resolved (http://bugs.uclibc.org):
 
+       #759:  Sysstat build broken without libintl
        #2479: host-module-init-tools 3.11 fails to build
        #2785: mtd-utils build fails due to missing libmtd
        #2797: pciutils dependencies on zlib not taken into account

diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in
index b084b4186fd4e4d702394081e9da4a75dfef9d27..28274d93e035e205194a2ae3309c95998360b858 100644 (file)
--- a/package/sysstat/Config.in
+++ b/package/sysstat/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_SYSSTAT
        bool "sysstat"
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
           The sysstat utilities are a collection of performance
           monitoring tools for Linux. These include sar, sadf, mpstat,

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 7294b86fedfee09698fd3d93b79d76fa66635a1b..4f2f66323defdc0665c711b7677f8ed42b52ac4b 100644 (file)
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -4,19 +4,20 @@
 #
 #############################################################
 
-SYSSTAT_VERSION = 9.1.5
+SYSSTAT_VERSION = 9.1.6
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
-SYSSTAT_AUTORECONF = NO
-SYSSTAT_LIBTOOL_PATCH = NO
-SYSSTAT_INSTALL_STAGING = NO
-SYSSTAT_INSTALL_TARGET = YES
 
 SYSSTAT_CONF_OPT = --disable-man-group
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 SYSSTAT_CONF_OPT += --disable-documentation
 endif
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+SYSSTAT_DEPENDENCIES += gettext libintl
+SYSSTAT_MAKE_OPT += CFLAGS+=-lintl
+endif
+
 # The isag tool is a post processing script that depends on tcl/tk
 # among other things. So we don't install it.
 SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install