From: Thomas Petazzoni Date: Mon, 3 Jul 2017 20:51:10 +0000 (+0200) Subject: lbreakout2: use the new gettext logic X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c10979723a07a26fd3be2a481105723b145b2e7f;p=buildroot.git lbreakout2: use the new gettext logic 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 --- diff --git a/package/lbreakout2/Config.in b/package/lbreakout2/Config.in index 221c9e2c5b..6788aca821 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 017d56244e..274c534660 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