From patchwork Fri Sep 21 00:54:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 185533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 91E822C008A for ; Fri, 21 Sep 2012 10:54:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C8E21A049B; Fri, 21 Sep 2012 00:54:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NG5g6o+uuNtN; Fri, 21 Sep 2012 00:54:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 22E7EA04CD; Fri, 21 Sep 2012 00:54:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AEFF98F74A for ; Fri, 21 Sep 2012 00:54:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E3B2A8783C for ; Fri, 21 Sep 2012 00:54:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NcAy6OIzMEKs for ; Fri, 21 Sep 2012 00:54:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id A9C4F863F9 for ; Fri, 21 Sep 2012 00:54:14 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1TErVU-000457-KM for buildroot@busybox.net; Fri, 21 Sep 2012 02:54:13 +0200 Received: from localhost ([127.0.0.1]) by vandecaa-laptop with esmtp (Exim 4.80) (envelope-from ) id 1TErVU-0007e0-8A for buildroot@busybox.net; Fri, 21 Sep 2012 02:54:12 +0200 To: buildroot@busybox.net From: "Arnout Vandecappelle \(Essensium/Mind\)" Date: Fri, 21 Sep 2012 02:54:12 +0200 Message-ID: <20120921005412.11838.10517.stgit@localhost> In-Reply-To: <20120921004927.11838.37292.stgit@localhost> References: <20120921004927.11838.37292.stgit@localhost> User-Agent: StGit/0.15 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 05/10] lshw: fix build with no LOCALE support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Arnout Vandecappelle (Essensium/Mind) lshw doesn't need libintl if -DNONLS is defined. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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)