From patchwork Tue Jul 4 14:48:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 784094 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 3x26VP1SJrz9t2R for ; Wed, 5 Jul 2017 00:54:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DBBB689318; Tue, 4 Jul 2017 14:53: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 FPnE6lz1d0Jn; Tue, 4 Jul 2017 14:53:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4706387589; Tue, 4 Jul 2017 14:53:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AD21E1BFBC3 for ; Tue, 4 Jul 2017 14:50:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A689A84D14 for ; Tue, 4 Jul 2017 14:50:12 +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 Be0EvJ2QFdO4 for ; Tue, 4 Jul 2017 14:50:12 +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 whitealder.osuosl.org (Postfix) with ESMTP id F12DD84590 for ; Tue, 4 Jul 2017 14:50:11 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id DC6C521FDE; Tue, 4 Jul 2017 16:50:09 +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 F3C9B20759; Tue, 4 Jul 2017 16:49:51 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Tue, 4 Jul 2017 16:48:32 +0200 Message-Id: <20170704144920.12318-53-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 052/100] ltris: 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 TARGET_NLS_LIBS to force linking against libintl - dropping BR2_PACKAGE_GETTEXT selection Signed-off-by: Thomas Petazzoni --- package/ltris/Config.in | 1 - package/ltris/ltris.mk | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/ltris/Config.in b/package/ltris/Config.in index bf73489..7d9dc04 100644 --- a/package/ltris/Config.in +++ b/package/ltris/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LTRIS bool "LTris" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_SDL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help LTris is a tetris clone, using SDL. It optionally requires SDL_mixer for audio support. A display with minimum 640x480 diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 8f12ab1..fb0d4c3 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -9,7 +9,8 @@ LTRIS_VERSION = 1.0.19 LTRIS_LICENSE = GPL-2.0+ LTRIS_LICENSE_FILES = COPYING -LTRIS_DEPENDENCIES = sdl +LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES) +LTRIS_LIBS = $(TARGET_NLS_LIBS) LTRIS_CONF_ENV = \ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ @@ -25,9 +26,4 @@ else LTRIS_CONF_OPTS += --disable-sound endif -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LTRIS_DEPENDENCIES += gettext -LTRIS_LIBS += -lintl -endif - $(eval $(autotools-package))