From patchwork Tue Jul 4 14:48:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 784080 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 3x26TH4Fh0z9s74 for ; Wed, 5 Jul 2017 00:53:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0CB70892A4; Tue, 4 Jul 2017 14:53:08 +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 gY9krSLXu0VK; Tue, 4 Jul 2017 14:53:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6580486765; Tue, 4 Jul 2017 14:53:07 +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 685FD1BFBC3 for ; Tue, 4 Jul 2017 14:50:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 64085849E1 for ; Tue, 4 Jul 2017 14:50:03 +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 skX8G4oq8VmY for ; Tue, 4 Jul 2017 14:50:02 +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 AC12383C0F for ; Tue, 4 Jul 2017 14:50:02 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 9523C21D4C; Tue, 4 Jul 2017 16:50:00 +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 7036221D5C; Tue, 4 Jul 2017 16:49:46 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Tue, 4 Jul 2017 16:48:19 +0200 Message-Id: <20170704144920.12318-40-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 039/100] lbreakout2: 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/lbreakout2/Config.in | 1 - package/lbreakout2/lbreakout2.mk | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package/lbreakout2/Config.in b/package/lbreakout2/Config.in index 221c9e2..6788aca 100644 --- a/package/lbreakout2/Config.in +++ b/package/lbreakout2/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LBREAKOUT2 bool "LBreakout2" select BR2_PACKAGE_SDL select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help LBreakout2 is the successor to LBreakout, a breakout-style arcade game in the manner of Arkanoid. Requires SDL, libpng, and diff --git a/package/lbreakout2/lbreakout2.mk b/package/lbreakout2/lbreakout2.mk index 017d562..274c534 100644 --- a/package/lbreakout2/lbreakout2.mk +++ b/package/lbreakout2/lbreakout2.mk @@ -10,15 +10,11 @@ LBREAKOUT2_SITE = http://downloads.sourceforge.net/lgames/lbreakout2/$(LBREAKOUT LBREAKOUT2_LICENSE = GPL-2.0+ LBREAKOUT2_LICENSE_FILES = COPYING -LBREAKOUT2_DEPENDENCIES = sdl libpng +LBREAKOUT2_DEPENDENCIES = sdl libpng $(TARGET_NLS_DEPENDENCIES) LBREAKOUT2_CONF_ENV = \ - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LBREAKOUT2_DEPENDENCIES += gettext -LBREAKOUT2_CONF_ENV += LIBS=-lintl -endif + SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ + LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y) LBREAKOUT2_DEPENDENCIES += sdl_mixer