From 24056cfdada751619439ea888ee7178f58c16f58 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 4 Jun 2015 12:52:31 +0200 Subject: [PATCH] libmicrohttpd: get rid of OpenSSL dependency Depending on both, GnuTLS and OpenSSL doesn't make sense, we should use either TLS implementation but not both. Use GnuTLS for now and get rid of OpenSSL dependency by explicitely telling the package's build-system to do so using CONFIGURE_ARGS. If future uses of libmicrohttpd require OpenSSL, it probably makes most sense to build several variants of the package, i.e. libmicrohttpd-openssl as well as libmicrohttpd-gnutls. As with most packages making use of any TLS implementation, these are build-time decissions resulting in conflicting variants of the same package which cannot be installed simultanously. Signed-off-by: Daniel Golle --- libs/libmicrohttpd/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile index 2ea96f237..d47875cec 100644 --- a/libs/libmicrohttpd/Makefile +++ b/libs/libmicrohttpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmicrohttpd PKG_VERSION:=0.9.42 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libmicrohttpd @@ -29,7 +29,7 @@ define Package/libmicrohttpd CATEGORY:=Libraries TITLE:=GNU libmicrohttpd is a library that runs an HTTP server. URL:=http://www.gnu.org/software/libmicrohttpd/ - DEPENDS:=+libpthread +libgcrypt +libgnutls +libgpg-error +libopenssl + DEPENDS:=+libpthread +libgcrypt +libgnutls +libgpg-error endef define Package/libmicrohttpd/description @@ -37,6 +37,13 @@ define Package/libmicrohttpd/description to run an HTTP server as part of another application. endef +CONFIGURE_ARGS += \ + --enable-https \ + --with-gnutls \ + --disable-curl \ + --disable-spdy \ + --without-openssl + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/