summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-12-26 03:55:49 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-12-26 22:40:54 (GMT)
commit562d1ad82e33cd2234af9abac7847e990af037ce (patch)
tree5a55634dffd9524af043ba4891b7c7d9af065018
parentf1b86cef9884894df26ed25efaabe254f8f0754b (diff)
downloadbuildroot-562d1ad82e33cd2234af9abac7847e990af037ce.tar.gz
buildroot-562d1ad82e33cd2234af9abac7847e990af037ce.tar.bz2
libmicrohttpd: bump to version 0.9.24
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libmicrohttpd/Config.in5
-rw-r--r--package/libmicrohttpd/libmicrohttpd.mk8
2 files changed, 9 insertions, 4 deletions
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index cfedc8f..4e78a99 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBMICROHTTPD
bool "libmicrohttpd"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
help
GNU libmicrohttpd is a small C library that makes it easy to
run an HTTP server as part of another application.
@@ -9,6 +10,10 @@ config BR2_PACKAGE_LIBMICROHTTPD
config BR2_PACKAGE_LIBMICROHTTPD_SSL
bool "https support"
depends on BR2_PACKAGE_LIBMICROHTTPD
+ select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT
help
Enable HTTPS (SSL) support.
+
+comment "libmicrohttpd needs a toolchain with thread support"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index f8690ee..cf84b2d 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -3,14 +3,14 @@
# libmicrohttpd
#
#############################################################
-LIBMICROHTTPD_VERSION = 0.4.6
-LIBMICROHTTPD_SOURCE = libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz
+
+LIBMICROHTTPD_VERSION = 0.9.24
LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
LIBMICROHTTPD_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
-LIBMICROHTTPD_DEPENDENCIES += libgcrypt
-LIBMICROHTTPD_CONF_OPT += --enable-https \
+LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
+LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
LIBMICROHTTPD_CONF_OPT += --disable-https