diff options
| author | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2012-11-01 15:36:00 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-07-30 23:36:39 +0200 |
| commit | cdc2420b4c332a0d69b8198c756bb054386c912a (patch) | |
| tree | 710e0a8e3afc8469f6813bcb9230cd38b92350d3 | |
| parent | da8860e4da533bbe3d684354b37174adb0e23b98 (diff) | |
lshw: fix build with no LOCALE support
lshw doesn't need libintl if -DNONLS is defined.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/lshw/Config.in | 2 | ||||
| -rw-r--r-- | package/lshw/lshw.mk | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/package/lshw/Config.in b/package/lshw/Config.in index 98beacd79..afefa6c46 100644 --- a/package/lshw/Config.in +++ b/package/lshw/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LSHW depends on BR2_INSTALL_LIBSTDCPP depends on BR2_LARGEFILE depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help lshw (Hardware Lister) is a small tool to provide detailed information on the hardware configuration of the machine. diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 71f52a581..cc003473e 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -6,10 +6,16 @@ LSHW_VERSION = B.02.16 LSHW_SITE = http://ezix.org/software/files + +LSHW_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_ENABLE_LOCALE),) +LSHW_CFLAGS += -DNONLS +endif + LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \ - RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all -LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)" -LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext) + RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all +LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" +LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) define LSHW_BUILD_CMDS $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT) |