From patchwork Tue May 8 11:19:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 157669 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 66A35B6EF1 for ; Tue, 8 May 2012 21:20:30 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 90E55A0268; Tue, 8 May 2012 11:20:28 +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 Z3GQb7kZF8D1; Tue, 8 May 2012 11:20:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BA463A0176; Tue, 8 May 2012 11:20:26 +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 CCC568F753 for ; Tue, 8 May 2012 11:20:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8825181929 for ; Tue, 8 May 2012 11:20:24 +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 VxyeyaaqGXzZ for ; Tue, 8 May 2012 11:20:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com [209.85.214.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0A14A8E867 for ; Tue, 8 May 2012 11:20:18 +0000 (UTC) Received: by bkty5 with SMTP id y5so10608183bkt.16 for ; Tue, 08 May 2012 04:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vTAibwLBk6yubOLNoUbOOmzmNL1klpx6KPoL5AIOMbY=; b=HM6G6nfK14FD2T5Z2H7JkLnZfeGTTD554HGJ40BYRMSCJW+GA67+MLHq8jmW7GCMmP VRnd5zH7wf95o4/i2usDz1Lkb0a45C9V7lrzVtahzFuhxkjax8UFd7la8H6/W/OEAFgs qcUEpm9TJi3mGVIgo3iRq0SNGniyx8u/h73XBM7/UE13NRt0JOwo/SFYlAbO0KYPRjuD JsBlNSCLDaI+iiLjm3aBlB1cTu15CTDzGHBRJKbw3H/dLvWwKErunCEKdWtXD4zADY3D cBqJm6QOH27Z1k60S+CNrUMvX8qV3wkGRCH7zOiuYqgFPaMHw0qcDizp+bIEraKQT1kI t0Mw== Received: by 10.204.149.216 with SMTP id u24mr3798803bkv.36.1336476017092; Tue, 08 May 2012 04:20:17 -0700 (PDT) Received: from samuel-laptop.home (ANantes-555-1-155-54.w2-1.abo.wanadoo.fr. [2.1.234.54]) by mx.google.com with ESMTPS id zx16sm38148591bkb.13.2012.05.08.04.20.14 (version=SSLv3 cipher=OTHER); Tue, 08 May 2012 04:20:15 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Tue, 8 May 2012 13:19:17 +0200 Message-Id: <1336475958-5714-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1336475958-5714-1-git-send-email-s.martin49@gmail.com> References: <4F7C6130.102@free-electrons.com> <1336475958-5714-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH 2/3] gettext: Rename BR2_PACKAGE_LIBINTL to BR2_PACKAGE_GETTEXT_NEEDS_BINARIES 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net libintl target does nothing but removing some binaries installed by gettext. This patch renames the BR2_PACKAGE_LIBINTL symbol to BR2_PACKAGE_GETTEXT_NEEDS_BINARIES and fixes the logic for packages that may need those gettext binaries. It also adds a warning about libintl support depending on locale enabling in the toolchain. Signed-off-by: Samuel Martin --- package/gettext/Config.in | 16 ++++++++-------- package/gettext/gettext.mk | 2 +- package/libidn/Config.in | 1 + package/php/Config.ext | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/gettext/Config.in b/package/gettext/Config.in index 0ee4065..461652f 100644 --- a/package/gettext/Config.in +++ b/package/gettext/Config.in @@ -12,12 +12,12 @@ config BR2_PACKAGE_GETTEXT comment "gettext requires a toolchain with WCHAR support" depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR -config BR2_PACKAGE_LIBINTL - bool "libintl" - depends on BR2_NEEDS_GETTEXT - depends on BR2_USE_WCHAR - help - Selecting this package installs all of gettext in the staging - directory and the shared library for it's use in the target. +comment "libintl requires a toolchain with locale/i18n support" + depends on BR2_PACKAGE_GETTEXT && !BR2_ENABLE_LOCALE - http://www.gnu.org/software/gettext/ +config BR2_PACKAGE_GETTEXT_NEEDS_BINARIES + bool + depends on BR2_PACKAGE_GETTEXT + help + Force to install gettext binaries (gettext, gettext.sh and gettextize) + in the target. diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 7c7b26c..0902edd 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -17,7 +17,7 @@ define GETTEXT_REMOVE_BINARIES rm -f $(TARGET_DIR)/usr/bin/gettextize endef -ifeq ($(BR2_PACKAGE_LIBINTL),y) +ifneq ($(BR2_PACKAGE_GETTEXT_NEEDS_BINARIES),y) GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_BINARIES endif diff --git a/package/libidn/Config.in b/package/libidn/Config.in index dcf9724..3e98245 100644 --- a/package/libidn/Config.in +++ b/package/libidn/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBIDN bool "libidn" select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_GETTEXT_NEEDS_BINARIES if BR2_NEEDS_GETTEXT_IF_LOCALE help Libidn's purpose is to encode and decode internationalized domain names. diff --git a/package/php/Config.ext b/package/php/Config.ext index bd630ee..2ea686c 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -68,6 +68,7 @@ config BR2_PACKAGE_PHP_EXT_FTP config BR2_PACKAGE_PHP_EXT_GETTEXT bool "gettext" select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT_NEEDS_BINARIES if BR2_NEEDS_GETTEXT depends on BR2_USE_WCHAR help gettext support