ソースを参照

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 <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 8 年 前
コミット
4e0d9554a0
2 ファイル変更1 行追加8 行削除
  1. 0 1
      package/pv/Config.in
  2. 1 7
      package/pv/pv.mk

+ 0 - 1
package/pv/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PV
 config BR2_PACKAGE_PV
 	bool "pv"
 	bool "pv"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	help
 	  Pipe Viewer - is a terminal-based tool for
 	  Pipe Viewer - is a terminal-based tool for
 	  monitoring the progress of data through a
 	  monitoring the progress of data through a

+ 1 - 7
package/pv/pv.mk

@@ -9,13 +9,7 @@ PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://www.ivarch.com/programs/sources
 PV_SITE = http://www.ivarch.com/programs/sources
 PV_LICENSE = Artistic-2.0
 PV_LICENSE = Artistic-2.0
 PV_LICENSE_FILES = doc/COPYING
 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
 # --relax linker option is enabled by default on sparc/sparc64
 # architectures, and it can't be used together with -r option, so
 # architectures, and it can't be used together with -r option, so