From patchwork Sat Nov 29 20:54:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 416009 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 F1A2614019C for ; Sun, 30 Nov 2014 07:54:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D6B2A91D15; Sat, 29 Nov 2014 20:54:57 +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 TWPDdhOximLM; Sat, 29 Nov 2014 20:54:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A0B1C91C3A; Sat, 29 Nov 2014 20:54:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 996421C24FA for ; Sat, 29 Nov 2014 20:54:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9616A94E2D for ; Sat, 29 Nov 2014 20:54:54 +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 IETYm-bRghDT for ; Sat, 29 Nov 2014 20:54:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4F62F94DC3 for ; Sat, 29 Nov 2014 20:54:50 +0000 (UTC) Received: from fwd38.aul.t-online.de (fwd38.aul.t-online.de [172.20.26.138]) by mailout08.t-online.de (Postfix) with SMTP id A56022C1A4D for ; Sat, 29 Nov 2014 21:54:47 +0100 (CET) Received: from fli4l.lan.fli4l (Thu0vMZZrhQxp26KTwszbXOmtmLHoNInfZL01yGkp6LLWUXwhUwDmEDAbDzb4RKQTG@[79.247.146.165]) by fwd38.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1Xup2P-2PGFvc0; Sat, 29 Nov 2014 21:54:41 +0100 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:44957) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85_RC1-XX) (envelope-from ) id 1Xup2O-0002mR-OD; Sat, 29 Nov 2014 21:54:41 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Nov 2014 21:54:37 +0100 Message-Id: <1417294477-12145-2-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1417294477-12145-1-git-send-email-bernd.kuhls@t-online.de> References: <1417294477-12145-1-git-send-email-bernd.kuhls@t-online.de> X-ID: Thu0vMZZrhQxp26KTwszbXOmtmLHoNInfZL01yGkp6LLWUXwhUwDmEDAbDzb4RKQTG X-TOI-MSGID: f9187d4a-a38a-46e0-8955-d77eb183e372 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 2/2] package/gnuplot: fix static linking with libiconv 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" Second of two patches to fix http://autobuild.buildroot.net/results/238/2386edb7f95920e84a35811a33f4333ee0a7a860/ http://autobuild.buildroot.net/results/57e/57ef313d3bd3da2b3e13f7fadb91006eb3f03a17/ http://autobuild.buildroot.net/results/a45/a45048a9b93d36aac0f5dd493f669a2dbd545744/ http://autobuild.buildroot.net/results/b6e/b6ee5d8f30601e37cb786eb7732c05117894851f/ http://autobuild.buildroot.net/results/7f3/7f392abeb7a058c9263c107b1640356e2583987a/ http://autobuild.buildroot.net/results/8d8/8d8cb2f2d5946f5342b96bb0ec4a3c9ffce88024/ Signed-off-by: Bernd Kuhls --- package/gnuplot/gnuplot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 238da68..45e33eb 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -26,8 +26,9 @@ GNUPLOT_CONF_OPTS = --without-x \ ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) GNUPLOT_CONF_OPTS += --with-gd -GNUPLOT_DEPENDENCIES += gd +GNUPLOT_DEPENDENCIES += gd $(if $(BR2_PACKAGE_LIBICONV),libiconv) GNUPLOT_CONF_ENV += \ + $(if $(BR2_PACKAGE_LIBICONV),LIBS="-liconv") \ ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config else GNUPLOT_CONF_OPTS += --without-gd