Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libmicrohttpd: Update to 0.9.62 and rework Makefile

Browse source 
Update to 0.9.62
Various cosmetic changes to Makefile
Fix variants and default to no ssl variant

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
This commit is contained in:
Daniel Engberg 2018-12-27 23:40:03 +01:00
parent ca6fe95dbb
commit f8ec00fe97
1 changed files with 35 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
libs/libmicrohttpd/Makefile
View file

@ -8,70 +8,65 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libmicrohttpd PKG_NAME:=libmicrohttpd
PKG_VERSION:=0.9.60 PKG_VERSION:=0.9.62
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/libmicrohttpd
PKG_HASH:=cd0e5d3f95a9e55ef7cdf4d0530e997ba00b8411af9149d9287db785d729c471
PKG_MAINTAINER:=Alexander Couzens <lynxis@fe80.eu> PKG_MAINTAINER:=Alexander Couzens <lynxis@fe80.eu>
PKG_LICENSE:=LGPL-2.1 PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_BUILD_PARALLEL:=1 PKG_SOURCE_URL:=@GNU/libmicrohttpd
PKG_HASH:=bd3e097d703f5091a6a01b56c0464a90fdd17f5d50478cea50a346b25c88db49
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/libmicrohttpd/Default define Package/libmicrohttpd/default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=GNU libmicrohttpd is a library that runs an HTTP server. TITLE:=GNU libmicrohttpd is a library that runs an HTTP server.
URL:=http://www.gnu.org/software/libmicrohttpd/ URL:=http://www.gnu.org/software/libmicrohttpd/
endef endef
define Package/libmicrohttpd define Package/libmicrohttpd
$(call Package/libmicrohttpd/Default) $(call Package/libmicrohttpd/default)
TITLE+=(with-ssl) VARIANT:=nossl
DEPENDS:=+libpthread +libgcrypt +libgnutls +libgpg-error CONFLICTS:=libmicrohttpd-ssl
endef endef
define Package/libmicrohttpd-no-ssl define Package/libmicrohttpd-ssl
$(call Package/libmicrohttpd/Default) $(call Package/libmicrohttpd/default)
TITLE+=(no-ssl) TITLE+= with SSL support
DEPENDS:=+libpthread VARIANT:=ssl
VARIANT:=no-ssl DEPENDS:=+libgcrypt +libgnutls +libgpg-error
CONFLICTS:=libmicrohttpd PROVIDES:=libmicrohttpd
endef
define Package/libmicrohttpd/description/Default
GNU libmicrohttpd is a small C library that is supposed to make it easy
to run an HTTP server as part of another application.
endef
define Package/libmicrohttpd-no-ssl/description
$(call Package/libmicrohttp/description/Default)
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-curl \ --disable-curl \
--disable-spdy \ --disable-rpath \
--without-openssl --disable-doc \
--disable-examples \
--enable-poll=no \
--enable-epoll=yes \
ifeq ($(BUILD_VARIANT),no-ssl) ifeq ($(BUILD_VARIANT),ssl)
CONFIGURE_ARGS += \
--disable-https \
--without-gnutls
else
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-https \ --enable-https \
--with-gnutls --with-gnutls
else
CONFIGURE_ARGS += \
--disable-https \
--without-gnutls
endif endif
define Package/libmicrohttpd/description
GNU libmicrohttpd is a small C library that is supposed to make it easy
to run an HTTP server as part of another application.
endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/include/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
@ -86,9 +81,5 @@ define Package/libmicrohttpd/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
endef endef
define Package/libmicrohttpd-no-ssl/install
$(call Package/libmicrohttpd/install,$1)
endef
$(eval $(call BuildPackage,libmicrohttpd)) $(eval $(call BuildPackage,libmicrohttpd))
$(eval $(call BuildPackage,libmicrohttpd-no-ssl)) $(eval $(call BuildPackage,libmicrohttpd-ssl))