From patchwork Mon Aug 25 23:13:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 382878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 1A0BC1400D7 for ; Tue, 26 Aug 2014 09:13:19 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0AC4A9150C; Mon, 25 Aug 2014 23:13:18 +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 GMahtOr0dqpI; Mon, 25 Aug 2014 23:13:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EA880914FF; Mon, 25 Aug 2014 23:13:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 412951BFDBD for ; Mon, 25 Aug 2014 23:13:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3FD02A0E3B for ; Mon, 25 Aug 2014 23:13:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hyaBL_SPeZic for ; Mon, 25 Aug 2014 23:13:11 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9F6B5A0E1D for ; Mon, 25 Aug 2014 23:13:11 +0000 (UTC) Received: from localhost.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id 53A4594001E; Tue, 26 Aug 2014 01:13:10 +0200 (CEST) From: Romain Naour To: buildroot@buildroot.net Date: Tue, 26 Aug 2014 01:13:06 +0200 Message-Id: <1409008386-21000-1-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 1.9.3 Subject: [Buildroot] [PATCH v2 1/1] package/xscreensaver: fix linking with intl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net xscreensaver doesn't build with (e)glibc toolchain when gettext package is selected. With (e)glibc libintl is provided by the libc whereas with uClibc it's provided by gettext. Linking with intl is only needed if the toolchain needs gettext. Fixes: http://autobuild.buildroot.net/results/39b/39b6ad07ad59d87afeca6e427c69f580bed35700/build-end.log Signed-off-by: Romain Naour --- V2: Select gettext package only when the toolchain needs gettext (Thomas Petazzoni) (ie: when BR2_NEEDS_GETTEXT is set) Build tested with an glibc based toolchain and without gettext package selected. Build tested with an uClibc based toolchain and with gettext package selected. --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index e2534a6..11c01ae 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT help XScreenSaver is the standard screen saver collection shipped on most Linux and Unix systems running the X11 Window System. diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 0e84d27..dba15bf 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -12,9 +12,10 @@ XSCREENSAVER_LICENSE = MIT-like GPLv2+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ - $(if $(BR2_PACKAGE_GETTEXT),gettext) + $(if $(BR2_NEEDS_GETTEXT),gettext) -XSCREENSAVER_CONF_ENV = $(if $(BR2_PACKAGE_GETTEXT),LIBS=-lintl) +# Linking with intl is only needed when the toolchain needs gettext +XSCREENSAVER_CONF_ENV = $(if $(BR2_NEEDS_GETTEXT),LIBS=-lintl) # otherwise we end up with host include/library dirs passed to the # compiler/linker