From patchwork Fri Aug 30 14:09:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 271297 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 6BCC82C00B7 for ; Sat, 31 Aug 2013 00:09:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 87B7F8DB83; Fri, 30 Aug 2013 14:09:58 +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 ao+6y9b4JcwE; Fri, 30 Aug 2013 14:09:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id AEEDD8DAC4; Fri, 30 Aug 2013 14:09:52 +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 752411BF82A for ; Fri, 30 Aug 2013 14:09:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 672168D8E5 for ; Fri, 30 Aug 2013 14:09:49 +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 yXD-EM4TUWBw for ; Fri, 30 Aug 2013 14:09:48 +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 26C788DA38 for ; Fri, 30 Aug 2013 14:09:48 +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; 30 Aug 2013 09:09:47 -0500 Received: from ares ([131.198.63.11]) by collinscrsmtp02.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2013083009094682-475748 ; Fri, 30 Aug 2013 09:09:46 -0500 From: Ryan Barnett To: buildroot@busybox.net Date: Fri, 30 Aug 2013 09:09:44 -0500 Message-Id: <1377871785-4964-2-git-send-email-rjbarnet@rockwellcollins.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1377871785-4964-1-git-send-email-rjbarnet@rockwellcollins.com> References: <1377871785-4964-1-git-send-email-rjbarnet@rockwellcollins.com> X-MIMETrack: Itemize by SMTP Server on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 08/30/2013 09:09:47 AM, Serialize by Router on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 08/30/2013 09:09:47 AM, Serialize complete at 08/30/2013 09:09:47 AM X-TNEFEvaluated: 1 Cc: Ryan Barnett Subject: [Buildroot] [PATCH v3 1/2] libssh2: add package 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 Signed-off-by: Ryan Barnett --- Change from v2 -> v3: * Use else when selecting configure and dependancy options with using libgcrypt or openssl (suggested by Baruch Siach) Changes v1 -> v2: * removed details from libssh2/Config.in (suggested by Arnout) * added libssh2 to select libgcrypt by default (suggested by Arnout) * fixed up configuration options libssh2 in libssh.mk (suggested by Arnout) * removed removal of documentation and static libraries since the target finalize step takes care of this (suggested by Arnout) * added check for zlib dependancy package/Config.in | 1 + package/libssh2/Config.in | 11 +++++++++++ package/libssh2/libssh2.mk | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 package/libssh2/Config.in create mode 100644 package/libssh2/libssh2.mk diff --git a/package/Config.in b/package/Config.in index 97cd7da..668f550 100644 --- a/package/Config.in +++ b/package/Config.in @@ -424,6 +424,7 @@ source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libsha1/Config.in" +source "package/libssh2/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/polarssl/Config.in" diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in new file mode 100644 index 0000000..1fb89ff --- /dev/null +++ b/package/libssh2/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBSSH2 + bool "libssh2" + select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL + help + libssh2 is a client-side C library implementing the SSH2 protocol + as defined by Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), + SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, + SECSH-DHGEX(04), and SECSH-NUMBERS(10) + + http://www.libssh2.org/ + diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk new file mode 100644 index 0000000..af93d61 --- /dev/null +++ b/package/libssh2/libssh2.mk @@ -0,0 +1,32 @@ +############################################################# +# +# libssh2 +# +############################################################# + +LIBSSH2_VERSION = 1.4.3 +LIBSSH2_SITE = http://www.libssh2.org/download/ +LIBSSH2_LICENSE = BSD +LIBSSH2_LICENSE_FILES = COPYING +LIBSSH2_INSTALL_STAGING = YES +LIBSSH2_CONF_OPT = --disable-examples-build + +# libssh2 must use either libgcrypt or OpenSSL +# Only select openssl if libgcrypt is not selected +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +LIBSSH2_DEPENDENCIES += libgcrypt +LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl +else +LIBSSH2_DEPENDENCIES += openssl +LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt +endif + +# Add zlib support if enabled +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBSSH2_DEPENDENCIES += zlib +LIBSSH2_CONF_OPT += --with-libz +else +LIBSSH2_CONF_OPT += --without-libz +endif + +$(eval $(autotools-package))