From patchwork Tue Jul 4 14:48:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 784060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x26RP6Nbjz9s74 for ; Wed, 5 Jul 2017 00:52:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 87E9F88C63; Tue, 4 Jul 2017 14:52:04 +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 Y2ruQuclS2lK; Tue, 4 Jul 2017 14:52:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9D3A789247; Tue, 4 Jul 2017 14:52:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6B0461BFBC3 for ; Tue, 4 Jul 2017 14:49:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 55C1686724 for ; Tue, 4 Jul 2017 14:49:53 +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 8PcXG++rrTPW for ; Tue, 4 Jul 2017 14:49:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by hemlock.osuosl.org (Postfix) with ESMTP id 937B889019 for ; Tue, 4 Jul 2017 14:49:52 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 7CA4621FC8; Tue, 4 Jul 2017 16:49:50 +0200 (CEST) Received: from localhost (ARennes-651-1-6-45.w86-215.abo.wanadoo.fr [86.215.149.45]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9E7E821E0D; Tue, 4 Jul 2017 16:49:38 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Tue, 4 Jul 2017 16:48:01 +0200 Message-Id: <20170704144920.12318-22-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170704144920.12318-1-thomas.petazzoni@free-electrons.com> References: <20170704144920.12318-1-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 021/100] ding-libs: use the new gettext logic X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" This commit switches to use the new gettext logic, which involves: - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies on gettext/host-gettext - dropping BR2_PACKAGE_GETTEXT selection The BR2_USE_WCHAR dependency was only needed for gettext. But now, we no longer need gettext unconditionally, so this dependency on BR2_USE_WCHAR is removed. Signed-off-by: Thomas Petazzoni --- package/ding-libs/Config.in | 6 ------ package/ding-libs/ding-libs.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/package/ding-libs/Config.in b/package/ding-libs/Config.in index d397f29..6dc2a80 100644 --- a/package/ding-libs/Config.in +++ b/package/ding-libs/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_DING_LIBS bool "ding-libs" - depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help The ding-libs packages contain a set of libraries used by @@ -16,7 +14,3 @@ config BR2_PACKAGE_DING_LIBS structure (libini_config). https://git.fedorahosted.org/git/ding-libs.git - -comment "ding-libs needs a toolchain w/ wchar" - depends on BR2_NEEDS_GETTEXT - depends on !BR2_USE_WCHAR diff --git a/package/ding-libs/ding-libs.mk b/package/ding-libs/ding-libs.mk index 4b045be..e9508cc 100644 --- a/package/ding-libs/ding-libs.mk +++ b/package/ding-libs/ding-libs.mk @@ -8,7 +8,7 @@ DING_LIBS_VERSION = 0_4_0 DING_LIBS_SOURCE = ding_libs-$(DING_LIBS_VERSION).tar.xz DING_LIBS_SITE = https://git.fedorahosted.org/cgit/ding-libs.git/snapshot DING_LIBS_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_GETTEXT),gettext) \ + $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) DING_LIBS_INSTALL_STAGING = YES DING_LIBS_LICENSE = LGPL-3.0+ (library),GPL-3.0+ (test programs)