jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

lshw: use the new gettext logic

Browse Source 
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

 - using BR2_SYSTEM_ENABLE_NLS instead of BR2_ENABLE_LOCALE to decide
   whether NLS support is enabled or not

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:57:18 +02:00
parent 0b8687d74b
commit 3acd9f845d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/lshw/Config.in
View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_LSHW
bool "lshw" bool "lshw"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help help
lshw (Hardware Lister) is a small tool to provide lshw (Hardware Lister) is a small tool to provide
detailed information on the hardware configuration of the machine. detailed information on the hardware configuration of the machine.

6
package/lshw/lshw.mk
View File

@ -10,7 +10,7 @@ LSHW_LICENSE = GPL-2.0
LSHW_LICENSE_FILES = COPYING LSHW_LICENSE_FILES = COPYING
LSHW_CFLAGS = $(TARGET_CFLAGS) LSHW_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_ENABLE_LOCALE),) ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
LSHW_CFLAGS += -DNONLS LSHW_CFLAGS += -DNONLS
endif endif
@ -18,8 +18,8 @@ LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
LSHW_MAKE_ENV = \ LSHW_MAKE_ENV = \
$(TARGET_MAKE_ENV) \ $(TARGET_MAKE_ENV) \
LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" LIBS=$(TARGET_NLS_LIBS)
LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
define LSHW_BUILD_CMDS define LSHW_BUILD_CMDS
$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS) $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)