Commit cdc2420b authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Thomas Petazzoni
Browse files

lshw: fix build with no LOCALE support 



lshw doesn't need libintl if -DNONLS is defined.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent da8860e4

package/lshw/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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.

package/lshw/lshw.mk

+9 −3
Original line number Diff line number Diff line
@@ -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)