From: Adam Duskett <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 07/15] openssh: support libressl.
Date: Fri, 14 Jul 2017 14:15:29 -0400 [thread overview]
Message-ID: <20170714181537.17479-7-aduskett@gmail.com> (raw)
In-Reply-To: <20170714181537.17479-1-aduskett@gmail.com>
While at it, fix formatting issues in Config.in
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/openssh/Config.in | 7 ++++---
package/openssh/openssh.mk | 9 ++++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/package/openssh/Config.in b/package/openssh/Config.in
index 75911402a..28f30cc12 100644
--- a/package/openssh/Config.in
+++ b/package/openssh/Config.in
@@ -1,10 +1,11 @@
config BR2_PACKAGE_OPENSSH
bool "openssh"
depends on BR2_USE_MMU # fork()
- select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBRESSL
select BR2_PACKAGE_ZLIB
help
- A free version of the SSH protocol suite of network connectivity
- tools. The standard 'ssh', 'sshd', 'scp', and friends.
+ A free version of the SSH protocol suite of network
+ connectivity tools. The standard 'ssh', 'sshd', 'scp', and
+ friends.
http://www.openssh.com/
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 38a32bf54..2a08450c8 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -30,7 +30,14 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
OPENSSH_CONF_OPTS += --without-pie
endif
-OPENSSH_DEPENDENCIES = zlib openssl
+OPENSSH_DEPENDENCIES = zlib
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+OPENSSH_DEPENDENCIES += openssl
+endif
+ifeq ($(BR2_PACKAGE_LIBRESSL),y)
+OPENSSH_DEPENDENCIES += libressl
+endif
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
OPENSSH_DEPENDENCIES += cryptodev-linux
--
2.13.0
next prev parent reply other threads:[~2017-07-14 18:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 18:15 [Buildroot] [PATCH 01/15] libressl: bump version to 2.5.5 Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 02/15] libwebsockets: support libressl Adam Duskett
2017-07-14 22:08 ` Thomas Petazzoni
2017-07-15 17:32 ` Adam Duskett
2017-07-18 19:38 ` Arnout Vandecappelle
2017-07-14 18:15 ` [Buildroot] [PATCH 03/15] libevent: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 04/15] libcurl: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 05/15] libsrtp: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 06/15] apr-uti: " Adam Duskett
2017-07-14 18:15 ` Adam Duskett [this message]
2017-07-14 18:15 ` [Buildroot] [PATCH 08/15] snmppp: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 09/15] syslog-ng: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 10/15] netsnmp: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 11/15] ntp: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 12/15] postgresql: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 13/15] swupdate: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 14/15] janus-gateway: " Adam Duskett
2017-07-14 18:15 ` [Buildroot] [PATCH 15/15] sngrep: " Adam Duskett
2017-07-15 7:13 ` [Buildroot] [PATCH 01/15] libressl: bump version to 2.5.5 Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170714181537.17479-7-aduskett@gmail.com \
--to=aduskett@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox