From patchwork Tue Jul 4 14:47:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 784050 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 3x26Qm3zvVz9rxm for ; Wed, 5 Jul 2017 00:51:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0578788C2A; Tue, 4 Jul 2017 14:51:40 +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 T+S8Mqi9rkuq; Tue, 4 Jul 2017 14:51:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 458C288E00; Tue, 4 Jul 2017 14:51:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6090E1BFBC3 for ; Tue, 4 Jul 2017 14:49:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5C4F62662D for ; Tue, 4 Jul 2017 14:49:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T00SCL8BDTou for ; Tue, 4 Jul 2017 14:49:47 +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 silver.osuosl.org (Postfix) with ESMTP id 871492FEAD for ; Tue, 4 Jul 2017 14:49:47 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id BEE0E21FBF; Tue, 4 Jul 2017 16:49:45 +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 8707921D5A; Tue, 4 Jul 2017 16:49:35 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Tue, 4 Jul 2017 16:47:54 +0200 Message-Id: <20170704144920.12318-15-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 014/100] axel: 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 Note that -lpthread is no longer needed for -lintl, but axel uses pthread directly anyway, so we have to keep -lpthread as part of LDFLAGS. Finally, we now use BR2_SYSTEM_ENABLE_NLS to decide whether NLS support should be enabled or not. Signed-off-by: Thomas Petazzoni --- package/axel/Config.in | 1 - package/axel/axel.mk | 12 +++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/package/axel/Config.in b/package/axel/Config.in index aea85bf..6e709cf 100644 --- a/package/axel/Config.in +++ b/package/axel/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_AXEL bool "axel" depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help HTTP/FTP download accelerator. diff --git a/package/axel/axel.mk b/package/axel/axel.mk index e89a946..60bf5e4 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -8,16 +8,10 @@ AXEL_VERSION = 2.4 AXEL_SITE = http://sources.buildroot.net AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING +AXEL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +AXEL_LDFLAGS = -lpthread $(TARGET_NLS_LIBS) -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -AXEL_DEPENDENCIES += gettext -AXEL_LDFLAGS += -lintl -endif - -# -lintl may use symbols from -lpthread -AXEL_LDFLAGS += -lpthread - -ifneq ($(BR2_ENABLE_LOCALE),y) +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) AXEL_DISABLE_I18N = --i18n=0 endif