From patchwork Tue Jul 4 14:48:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 784074 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 3x26Sk2DP4z9s74 for ; Wed, 5 Jul 2017 00:53:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4EE90891FC; Tue, 4 Jul 2017 14:52:49 +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 DLtF2JiDwmP8; Tue, 4 Jul 2017 14:52:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E377889431; Tue, 4 Jul 2017 14:52:47 +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 442751C42B2 for ; Tue, 4 Jul 2017 14:49:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2933A88F94 for ; Tue, 4 Jul 2017 14:49:59 +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 aAWF8wFkptZO for ; Tue, 4 Jul 2017 14:49:55 +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 E9032867C5 for ; Tue, 4 Jul 2017 14:49:54 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 2C43D207E1; Tue, 4 Jul 2017 16:49:53 +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 401F9207E1; Tue, 4 Jul 2017 16:49:41 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Tue, 4 Jul 2017 16:48:07 +0200 Message-Id: <20170704144920.12318-28-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 027/100] exiv2: 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 - using BR2_SYSTEM_ENABLE_NLS instead of BR2_ENABLE_LOCALE to decide if NLS support should be enabled or not Signed-off-by: Thomas Petazzoni --- package/exiv2/exiv2.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 6bc8848..32029ba 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -42,11 +42,10 @@ else EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF endif -ifeq ($(BR2_ENABLE_LOCALE),y) +EXIV2_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=ON -ifeq ($(BR2_PACKAGE_GETTEXT),y) -EXIV2_DEPENDENCIES += gettext -endif else EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=OFF endif