All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 05/10] lshw: fix build with no LOCALE support
Date: Fri, 21 Sep 2012 02:54:12 +0200	[thread overview]
Message-ID: <20120921005412.11838.10517.stgit@localhost> (raw)
In-Reply-To: <20120921004927.11838.37292.stgit@localhost>

From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

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

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/lshw/Config.in |    2 +-
 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 98beacd..afefa6c 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 68daa0d..b3c2214 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)

  parent reply	other threads:[~2012-09-21  0:54 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-21  0:53 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
2012-09-21  0:53 ` [Buildroot] [PATCH 01/10] diffutils: only needs gettext if locale is selected Arnout Vandecappelle
2012-09-21  0:53 ` [Buildroot] [PATCH 02/10] flex: " Arnout Vandecappelle
2012-09-21  0:54 ` [Buildroot] [PATCH 03/10] ndisc6: " Arnout Vandecappelle
2012-09-21  0:54 ` [Buildroot] [PATCH 04/10] util-linux: " Arnout Vandecappelle
2012-09-21  0:54 ` Arnout Vandecappelle [this message]
2012-09-21  0:54 ` [Buildroot] [PATCH 06/10] avahi: remove double dependency on gettext Arnout Vandecappelle
2012-09-21  0:54 ` [Buildroot] [PATCH 07/10] pulseaudio: remove " Arnout Vandecappelle
2012-09-21  7:30   ` Thomas Petazzoni
2012-09-21  0:54 ` [Buildroot] [PATCH 08/10] gdk-pixbuf: " Arnout Vandecappelle
2012-09-21  0:54 ` [Buildroot] [PATCH 09/10] glib-networking: remove redundant " Arnout Vandecappelle
2012-09-21  0:54 ` [Buildroot] [PATCH 10/10] libsoup: " Arnout Vandecappelle
  -- strict thread matches above, loose matches on Subject: below --
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
2012-10-14 21:10 ` [Buildroot] [PATCH 05/10] lshw: fix build with no LOCALE support Arnout Vandecappelle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120921005412.11838.10517.stgit@localhost \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.