diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 23:19:34 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:35:41 +0200 |
| commit | 9835c1921c08f6eb7723d5df64371ac3446a7539 (patch) | |
| tree | 39a887cb3147bbd88fcd68071d5f84707db9b380 /package/sysstat | |
| parent | 61de612a0b704bbc63da3d21e05331a26320bcdb (diff) | |
| download | buildroot-9835c1921c08f6eb7723d5df64371ac3446a7539.tar.gz buildroot-9835c1921c08f6eb7723d5df64371ac3446a7539.zip | |
sysstat: use the new gettext logic
This commit switches to use the new gettext logic, which involves:
- using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
on gettext/host-gettext
- using TARGET_NLS_LIBS to force linking against libintl
- dropping BR2_PACKAGE_GETTEXT selection
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/sysstat')
| -rw-r--r-- | package/sysstat/Config.in | 1 | ||||
| -rw-r--r-- | package/sysstat/sysstat.mk | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 923c48a110..442b787684 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_SYSSTAT bool "sysstat" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_GETTEXT 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 bd73214c35..e4ba662643 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -8,14 +8,10 @@ SYSSTAT_VERSION = 11.4.4 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors -SYSSTAT_DEPENDENCIES = host-gettext +SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -SYSSTAT_DEPENDENCIES += gettext -SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) -lintl" -endif +SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" # The isag tool is a post processing script that depends on tcl/tk # among other things. So we don't install it. |
