From 4e0d9554a0c2d558f5ddc9cc34239e7b05b7f457 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 17:07:42 +0200 Subject: [PATCH] pv: 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 - dropping BR2_PACKAGE_GETTEXT selection Signed-off-by: Thomas Petazzoni --- package/pv/Config.in | 1 - package/pv/pv.mk | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package/pv/Config.in b/package/pv/Config.in index d7322963c0..671f78e8c9 100644 --- a/package/pv/Config.in +++ b/package/pv/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PV bool "pv" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Pipe Viewer - is a terminal-based tool for monitoring the progress of data through a diff --git a/package/pv/pv.mk b/package/pv/pv.mk index 2279805a65..0ef5a6f6a2 100644 --- a/package/pv/pv.mk +++ b/package/pv/pv.mk @@ -9,13 +9,7 @@ PV_SOURCE = pv-$(PV_VERSION).tar.bz2 PV_SITE = http://www.ivarch.com/programs/sources PV_LICENSE = Artistic-2.0 PV_LICENSE_FILES = doc/COPYING - -# pv configure script is somewhat stupid: if it cannot find the host -# gettext tool msgfmt, it concludes that gettext is not available, and -# provides its own minimal version. Unfortunately, this minimal -# version conflicts with the available target gettext. We fix this by -# ensuring that host-gettext is built if gettext support is enabled; -PV_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext host-gettext) +PV_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # --relax linker option is enabled by default on sparc/sparc64 # architectures, and it can't be used together with -r option, so