From patchwork Tue Jul 4 14:48:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 784130 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 3x26YW1RtCz9t2R for ; Wed, 5 Jul 2017 00:57:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D58E389BB1; Tue, 4 Jul 2017 14:55:38 +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 4KvBQQOYcg15; Tue, 4 Jul 2017 14:55:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EEE2A88BED; Tue, 4 Jul 2017 14:55:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B5DA01C42BB for ; Tue, 4 Jul 2017 14:50:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A4F60873FF for ; Tue, 4 Jul 2017 14:50:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h14w3Sz8RIbp for ; Tue, 4 Jul 2017 14:50:22 +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 fraxinus.osuosl.org (Postfix) with ESMTP id 10243873F8 for ; Tue, 4 Jul 2017 14:50:22 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id EEC7B21FEC; Tue, 4 Jul 2017 16:50:19 +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 A58CA2084F; Tue, 4 Jul 2017 16:49:57 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Tue, 4 Jul 2017 16:48:42 +0200 Message-Id: <20170704144920.12318-63-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 062/100] pango: 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 Signed-off-by: Thomas Petazzoni --- package/pango/Config.in | 1 - package/pango/pango.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pango/Config.in b/package/pango/Config.in index 7813c4e..dd2117a 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_PANGO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_HARFBUZZ - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 help Pango is a library for laying out and rendering of text, with an diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 2f2d580..7556f0b 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -17,7 +17,7 @@ PANGO_CONF_OPTS = --enable-explicit-deps=no HOST_PANGO_CONF_OPTS = --enable-explicit-deps=no PANGO_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ + $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf \ libglib2 \ cairo \