From patchwork Mon Sep 3 22:02:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 181422 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 9D7472C008F for ; Tue, 4 Sep 2012 08:03:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0B704A0266; Mon, 3 Sep 2012 22:03:46 +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 75AuT9Ijwpqh; Mon, 3 Sep 2012 22:03:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 76B9BA02B5; Mon, 3 Sep 2012 22:03:17 +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 B63948F798 for ; Mon, 3 Sep 2012 22:03:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 044B28A3C3 for ; Mon, 3 Sep 2012 22:03:11 +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 eMw10fw1O0oc for ; Mon, 3 Sep 2012 22:03:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.smtpout.orange.fr (smtp04.smtpout.orange.fr [80.12.242.126]) by whitealder.osuosl.org (Postfix) with ESMTP id 45DE18A304 for ; Mon, 3 Sep 2012 22:03:08 +0000 (UTC) Received: from treguer.bzh.lan ([90.32.144.8]) by mwinf5d08 with ME id um341j0060B56Sa03m37WS; Tue, 04 Sep 2012 00:03:07 +0200 From: "Yann E. MORIN" To: buildroot@busybox.net Date: Tue, 4 Sep 2012 00:02:53 +0200 Message-Id: <1346709781-18158-4-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1346709781-18158-1-git-send-email-yann.morin.1998@free.fr> References: <1346709781-18158-1-git-send-email-yann.morin.1998@free.fr> Cc: Thomas Petazzoni , Maxime Ripard , "Yann E. MORIN" Subject: [Buildroot] [PATCH 03/11] gettext: remove libintl handling 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 From: Thomas Petazzoni Now, the gettext package always: * install everything to the staging directory * install the libraries to the target directory Note that this commit removes BR2_PACKAGE_LIBINTL without updating the packages, it is done in a separate commit to ease the review process. Signed-off-by: Thomas Petazzoni Tested-by: "Yann E. MORIN" [yann.morin.1998@free.fr: keep BR2_PACKAGE_LIBINTL as blind option] Signed-off-by: "Yann E. MORIN" Tested-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) CC: Samuel Martin --- package/gettext/Config.in | 14 ++++++-------- package/gettext/gettext.mk | 7 +------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/package/gettext/Config.in b/package/gettext/Config.in index 0ee4065..04f7de6 100644 --- a/package/gettext/Config.in +++ b/package/gettext/Config.in @@ -7,17 +7,15 @@ config BR2_PACKAGE_GETTEXT framework to help other GNU packages produce multi-lingual messages. + Only the gettext libraries will be installed in the + target. The full gettext suite, including tools, will be + installed in the staging directory. + http://www.gnu.org/software/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. - - http://www.gnu.org/software/gettext/ + bool + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 6b2c336..4dff941 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -112,7 +112,7 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY) gettext-legal-info: @$(call legal-warning-pkg,gettext,legal-info not yet implemented) -gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) +gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY) gettext-unpacked: $(GETTEXT_DIR)/.unpacked @@ -139,16 +139,11 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) libgettext*.so*.la libintl*.so*.la) touch -c $@ -libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY) - ############################################################# # # Toplevel Makefile options # ############################################################# -ifeq ($(BR2_PACKAGE_LIBINTL),y) -TARGETS+=libintl -endif ifeq ($(BR2_PACKAGE_GETTEXT),y) TARGETS+=gettext endif