From patchwork Fri Jun 27 14:18:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Coffignal X-Patchwork-Id: 364983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id D8CC51400DE for ; Sat, 28 Jun 2014 00:13:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 26B0532213; Fri, 27 Jun 2014 14:13:10 +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 2YdITa4XmETW; Fri, 27 Jun 2014 14:13:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 60E3C321D3; Fri, 27 Jun 2014 14:13:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 016AB1BF9EE for ; Fri, 27 Jun 2014 14:13:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F250F321D3 for ; Fri, 27 Jun 2014 14:13:07 +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 vuuvNHBIkZsq for ; Fri, 27 Jun 2014 14:13:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mailhost.geral.com (mailhost.geral.com [37.58.166.5]) by silver.osuosl.org (Postfix) with ESMTP id 84E603219F for ; Fri, 27 Jun 2014 14:13:07 +0000 (UTC) Received: from localhost.localdomain (192.168.44.180) by VMSMBX02.gpi.pri (192.168.50.136) with Microsoft SMTP Server (TLS) id 15.0.712.24; Fri, 27 Jun 2014 16:12:35 +0200 From: Alexandre Coffignal To: Date: Fri, 27 Jun 2014 16:18:04 +0200 Message-ID: <1403878684-11934-1-git-send-email-acoffignal@geral.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Originating-IP: [192.168.44.180] X-ClientProxiedBy: VMSCAS01.gpi.pri (192.168.50.137) To VMSMBX02.gpi.pri (192.168.50.136) Subject: [Buildroot] [PATCH 1/1] libssh2: fix library search path issues when zlib support enabled 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Alexandre Coffignal --- package/libssh2/libssh2.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 19df9af..73aae8e 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -28,7 +28,8 @@ endif # Add zlib support if enabled ifeq ($(BR2_PACKAGE_ZLIB),y) LIBSSH2_DEPENDENCIES += zlib -LIBSSH2_CONF_OPT += --with-libz +LIBSSH2_CONF_OPT += --with-libz \ + --with-libz-prefix=$(STAGING_DIR)/usr else LIBSSH2_CONF_OPT += --without-libz endif