Skip to contentSkip to conversation

Pull request for branch neon-ssl

GIT PULL New Nigel Kukard 2 participants 3 messages Dec 21, 2009

lore
Share & tools
lore
#0 lore raw

The following changes since commit 14aa5ee54f33d05a0bd01f21635e095ba07f83ec:
Peter Korsgaard (1):
mtd-utils: move phony dependencies to toplevel mtd-host target

are available in the git repository at:

git://git.busybox.net/~nkukard/git/buildroot neon-ssl

Nigel Kukard (1):
* Allow neon to be configured with SSL support

 package/neon/Config.in |    6 ++++++
 package/neon/neon.mk   |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

Thanks,

Signature · 1 line
Nigel Kukard
#1 lore raw

PATCH 1/1 * Allow neon to be configured with SSL support

---
 package/neon/Config.in |    6 ++++++
 package/neon/neon.mk   |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
package/neon/Config.in +6 -0
index ce72a2f..318e4c6 100644
@@ -12,6 +12,12 @@ config BR2_PACKAGE_NEON_ZLIB
 	help
 	  build with ZLIB support
 
+config BR2_PACKAGE_NEON_SSL
+	bool "SSL support"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  build with SSL support
+
 choice
 	prompt "XML Support"
 	default BR2_PACKAGE_NEON_NOXML
package/neon/neon.mk +6 -0
index 1f26a0c..ed5f999 100644
@@ -22,6 +22,12 @@ NEON_DEPENDENCIES+=zlib
 else
 NEON_CONF_OPT+=--without-zlib
 endif
+ifeq ($(BR2_PACKAGE_NEON_SSL),y)
+NEON_CONF_OPT+=--with-ssl
+NEON_DEPENDENCIES+=openssl
+else
+NEON_CONF_OPT+=--without-ssl
+endif
 ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
 NEON_CONF_OPT+=--with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
 NEON_CONF_OPT+=--with-libxml2=no
Signature · 1 line
1.6.4
#2 lore raw

PATCH 1/1 * Allow neon to be configured with SSL support

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Nigel" == Nigel Kukard <[email protected]> writes:

Nigel> Signed-off-by: Nigel Kukard <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard