Message ID | 51fb04216a181a16f3bf41bc4c984234a4b256e5.1473326919.git.yann.morin.1998@free.fr |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <buildroot-bounces@busybox.net> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sVFYp3ZzKz9ryT for <incoming@patchwork.ozlabs.org>; Thu, 8 Sep 2016 19:35:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=R844/+Ai; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EB3D531C88; Thu, 8 Sep 2016 09:35:24 +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 sV-KvZsakjDE; Thu, 8 Sep 2016 09:35:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9822F31CF9; Thu, 8 Sep 2016 09:35:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D03081C1EF6 for <buildroot@lists.busybox.net>; Thu, 8 Sep 2016 09:35:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6A0B88CF29 for <buildroot@lists.busybox.net>; Thu, 8 Sep 2016 09:35:15 +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 J9L-B5dOBXVV for <buildroot@lists.busybox.net>; Thu, 8 Sep 2016 09:35:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id DAA0888771 for <buildroot@buildroot.org>; Thu, 8 Sep 2016 09:35:12 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id b187so2948582wme.0 for <buildroot@buildroot.org>; Thu, 08 Sep 2016 02:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DOboUX51MPKXxjITwbOQL0MjMciUkbqBMFMOLfvnPVI=; b=R844/+Ai1XsrYBYpJAIxkWbXKGs7yOi5zlUSB7hcgpDv23Dk4YajEbMc9hRk0pHBX+ 3BkcV7qnSCbunkAZhtX3Tf2LJTlEgkM/MXW+FYvbtIihQeElEN3UP1ABBfsRTj5qv9KY 5n5hgkmhiLtNtxsFT6+lWm0oUU9qTRuBlMugH4U24CHaqdzBJbTax89OEqimNB1y3DSU aUfikRsMhZMQAss4hjdtXJZhWnwRY1bgV/TrPQkvYR1TFfZl/0sYzsVYTBb1gFw6nsAH VLrjm2rmtmlDiZUPNudcxVjK15VNS+VBKZA1FeU6bhFDmGyR21wabU9lvqRR2A6nEiNH R5+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DOboUX51MPKXxjITwbOQL0MjMciUkbqBMFMOLfvnPVI=; b=NtMY+ZzgB7d9HmyMHmsSJseA7qvijHHj47WjOfEgCVw5pkHSx6WfTm+GCML/PhqxmL DmQg7AoGXSH9BhEj7hjgX09W88rmpZjZhi4G9R+y7Wq26eiuDpPFomElZ0vBBGUN9FVA gFrG6dBAg3JX12ZJv9CXjFgyie6cgA5241Z0b7bcI9HZq6rILehl8Yn2ge/fWRkkatHo FkqC7uVmBhlPKhN+NQYDcnV9wR0+FquAsdhYLR7wuYfz+wlPnsga3JnGa5qvLgudTjTX m8f6qJlXBgruJMeAomtMjLFbCnJVSt1C6JFEKpsfvXgZHbkw0ubuBoSTwDw8dBxgxKj/ /wkA== X-Gm-Message-State: AE9vXwPfGtHsSkoWFnKA7bqraPi1lQxR+j+9mQSq7VJa1sUV3wxaMu5GqvAYxWT0qbuFRA== X-Received: by 10.194.95.36 with SMTP id dh4mr19527097wjb.156.1473327311443; Thu, 08 Sep 2016 02:35:11 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id k2sm8617959wmg.23.2016.09.08.02.35.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 02:35:10 -0700 (PDT) From: "Yann E. MORIN" <yann.morin.1998@free.fr> To: buildroot@buildroot.org Date: Thu, 8 Sep 2016 11:35:07 +0200 Message-Id: <51fb04216a181a16f3bf41bc4c984234a4b256e5.1473326919.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1473326919.git.yann.morin.1998@free.fr> References: <cover.1473326919.git.yann.morin.1998@free.fr> MIME-Version: 1.0 Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Romain Naour <romain.naour@openwide.fr>, "Yann E. MORIN" <yann.morin.1998@free.fr> Subject: [Buildroot] [PATCH 2/2] package/libssh2: fix dependency on libgcrypt X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot <buildroot.busybox.net> List-Unsubscribe: <http://lists.busybox.net/mailman/options/buildroot>, <mailto:buildroot-request@busybox.net?subject=unsubscribe> List-Archive: <http://lists.busybox.net/pipermail/buildroot/> List-Post: <mailto:buildroot@busybox.net> List-Help: <mailto:buildroot-request@busybox.net?subject=help> List-Subscribe: <http://lists.busybox.net/mailman/listinfo/buildroot>, <mailto:buildroot-request@busybox.net?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net> |
diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in index 0deb3bb..e2e75d8 100644 --- a/package/libssh2/Config.in +++ b/package/libssh2/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBSSH2 bool "libssh2" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS && !BR2_PACKAGE_OPENSSL # libgcrypt + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS || BR2_PACKAGE_OPENSSL # libgcrypt select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL help libssh2 is a client-side C library implementing the SSH2
Since 2f89476 (package/libgpg-error: bump to version 1.23), libssh2 has inherited the dependency from libgcrypt (propagated from libgpg-error). However, since libssh2 can use either openssl or libgcrypt as a backend, the dependency should be relaxed when openssl is available. But the test is broken and inverted: it will make libssh unavailable as soon as openssl is enabled. Fix the dependency. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Cc: Jörg Krause <joerg.krause@embedded.rocks> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Cc: Romain Naour <romain.naour@openwide.fr> --- package/libssh2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)