Kaynağa Gözat

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>
Gustavo Zacarias 14 yıl önce
ebeveyn
işleme
474166298e
3 değiştirilmiş dosya ile 10 ekleme ve 6 silme
  1. 2 1
      CHANGES
  2. 2 0
      package/sysstat/Config.in
  3. 6 5
      package/sysstat/sysstat.mk

+ 2 - 1
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

+ 2 - 0
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,

+ 6 - 5
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