From patchwork Thu Sep 26 13:59:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 278199 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 33C5F2C009C for ; Fri, 27 Sep 2013 00:00:09 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B223331A99; Thu, 26 Sep 2013 14:00: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 q-KE4EhCAdQZ; Thu, 26 Sep 2013 14:00:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4A80731DB2; Thu, 26 Sep 2013 14:00:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4C0881BF82F for ; Thu, 26 Sep 2013 14:00:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 416438B823 for ; Thu, 26 Sep 2013 14:00:03 +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 42Rao3FEivdt for ; Thu, 26 Sep 2013 14:00:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs02.rockwellcollins.com (secvs02.rockwellcollins.com [205.175.225.241]) by whitealder.osuosl.org (Postfix) with ESMTPS id 65F728ABD7 for ; Thu, 26 Sep 2013 14:00:01 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO collinscrsmtp02.rockwellcollins.com) ([131.198.63.133]) by mail-virt.rockwellcollins.com with ESMTP; 26 Sep 2013 08:59:47 -0500 Received: from ares ([131.198.63.11]) by collinscrsmtp02.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2013092608594431-1741879 ; Thu, 26 Sep 2013 08:59:44 -0500 From: Ryan Barnett To: buildroot@busybox.net Date: Thu, 26 Sep 2013 08:59:34 -0500 Message-Id: <1380203974-16321-1-git-send-email-rjbarnet@rockwellcollins.com> X-Mailer: git-send-email 1.7.1 X-MIMETrack: Itemize by SMTP Server on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/26/2013 08:59:44 AM, Serialize by Router on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/26/2013 08:59:47 AM, Serialize complete at 09/26/2013 08:59:47 AM X-TNEFEvaluated: 1 Subject: [Buildroot] [PATCH 1/1] libssh2: fix library search path issues 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 Fix issues with some toolchains not finding libssl or libgcrypt. Fixes http://autobuild.buildroot.net/results/eeaaf41c0c5f88357af8445750dce776774c2b5d Fixes http://autobuild.buildroot.net/results/7a2590a7c3a1f52590f3e886b7cf9d04ad966a10 Signed-off-by: Ryan Barnett --- package/libssh2/libssh2.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 10eb5ed..ff35d9e 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -15,10 +15,12 @@ LIBSSH2_CONF_OPT = --disable-examples-build # Only select openssl if libgcrypt is not selected ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSSH2_DEPENDENCIES += libgcrypt -LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl +LIBSSH2_CONF_OPT += --with-libgcrypt --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ + --without-openssl else LIBSSH2_DEPENDENCIES += openssl -LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt +LIBSSH2_CONF_OPT += --with-openssl --with-libssl-prefix=$(STAGING_DIR)/usr \ + --without-libgcrypt endif # Add zlib support if enabled