From patchwork Wed Apr 17 21:31:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shawn J. Goff" X-Patchwork-Id: 237367 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 59D1B2C00AC for ; Thu, 18 Apr 2013 07:31:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A30D3319C7; Wed, 17 Apr 2013 21:31:47 +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 yeFrejAu9oto; Wed, 17 Apr 2013 21:31:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1B044319B3; Wed, 17 Apr 2013 21:31:46 +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 C2C378F7A4 for ; Wed, 17 Apr 2013 21:31:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EFB48D025 for ; Wed, 17 Apr 2013 21:31:44 +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 5GqrRpTVR2DC for ; Wed, 17 Apr 2013 21:31:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-gh0-f181.google.com (mail-gh0-f181.google.com [209.85.160.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8368E8D034 for ; Wed, 17 Apr 2013 21:31:31 +0000 (UTC) Received: by mail-gh0-f181.google.com with SMTP id 3so250460ghz.40 for ; Wed, 17 Apr 2013 14:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=v+WIgeL85D6vF5fF2GEljSjjhiaHzXMb7ZgvrJIz8C8=; b=YW0eWj5nQBJkVPjgUgFIvARKw25aQfoDkXHifTp888BIKAsrFH7ULDxU5bKhcn8wFL c4yRc+Efqaj9/ZWOC8W/UgaOQe6Ap8o/K0bRtBXbfrUQqLArCKuHgf+P6uiU/Eak44Gl Xt2lwLnDQk5kvBS+PtiVb7RE2k/7SWjL7Wn1Eufmu3LxQVPPS2PFNq+JLO7RPm8iNSGF AM4MtPRd8K1r3iF4JtOSMxhfWKjgeX11T7l8azONdqwCaRTSnc6LvQwieBwN72Z5eH7+ 47Ykf+uUEmlGAZl+BzulYqjbsRep1VaWhVoMJKvWvJxdtrC3Zkqa99ytQkO7FUW/qdBA I1Wg== X-Received: by 10.236.83.50 with SMTP id p38mr5544576yhe.67.1366234290550; Wed, 17 Apr 2013 14:31:30 -0700 (PDT) Received: from localhost.localdomain (static-108-33-27-66.tampfl.fios.verizon.net. [108.33.27.66]) by mx.google.com with ESMTPS id i44sm12140036yhk.17.2013.04.17.14.31.28 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 14:31:29 -0700 (PDT) From: "Shawn J. Goff" To: buildroot@busybox.net Date: Wed, 17 Apr 2013 17:31:27 -0400 Message-Id: <1366234287-8062-1-git-send-email-shawn7400@gmail.com> X-Mailer: git-send-email 1.8.1.5 Cc: "Shawn J. Goff" Subject: [Buildroot] [PATCH v2] libcurl: specify capath 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 From: "Shawn J. Goff" Since openssl's path is '/etc/ssl/' (specified in our openssl package), we should also make sure that's what curl is using. Previously, it's hasn't been specified, which means it changes depending on the host system where it's compiled. Signed-off-by: Shawn J. Goff --- Moved the option inside the BR2_PACKAGE_OPENSSL conditional. package/libcurl/libcurl.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a631953..f0236d9 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -27,7 +27,9 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs # are found first. LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib -LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom +LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \ + --with-random=/dev/urandom \ + --with-ca-path=/etc/ssl/certs else LIBCURL_CONF_OPT += --without-ssl endif