Bladeren bron

powertop: 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>
Thomas Petazzoni 8 jaren geleden
bovenliggende
commit
e43b76d716
2 gewijzigde bestanden met toevoegingen van 3 en 7 verwijderingen
  1. 0 1
      package/powertop/Config.in
  2. 3 6
      package/powertop/powertop.mk

+ 0 - 1
package/powertop/Config.in

@@ -7,7 +7,6 @@ config BR2_PACKAGE_POWERTOP
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_PCIUTILS
 	select BR2_PACKAGE_PCIUTILS
 	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_LIBNL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	help
 	  A tool to diagnose issues with power consumption and power management
 	  A tool to diagnose issues with power consumption and power management
 
 

+ 3 - 6
package/powertop/powertop.mk

@@ -7,14 +7,11 @@
 POWERTOP_VERSION = 2.9
 POWERTOP_VERSION = 2.9
 POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop
 POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop
 POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION).tar.gz
 POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION).tar.gz
-POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-gettext host-pkgconf
+POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \
+	$(TARGET_NLS_DEPENDENCIES)
 POWERTOP_LICENSE = GPL-2.0
 POWERTOP_LICENSE = GPL-2.0
 POWERTOP_LICENSE_FILES = COPYING
 POWERTOP_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-POWERTOP_DEPENDENCIES += gettext
-POWERTOP_CONF_ENV += LIBS='-lintl'
-endif
+POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 
 # Help powertop at finding the right ncurses library depending on
 # Help powertop at finding the right ncurses library depending on
 # which one is available.
 # which one is available.