mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
Merge pull request #8569 from bluewavenet/patch-3
libmicrohttpd: Revert to Named no-ssl Version
This commit is contained in:
@@ -30,10 +30,11 @@ define Package/libmicrohttpd/default
|
||||
URL:=http://www.gnu.org/software/libmicrohttpd/
|
||||
endef
|
||||
|
||||
define Package/libmicrohttpd
|
||||
define Package/libmicrohttpd-no-ssl
|
||||
$(call Package/libmicrohttpd/default)
|
||||
VARIANT:=nossl
|
||||
CONFLICTS:=libmicrohttpd-ssl
|
||||
DEFAULT_VARIANT:=1
|
||||
PROVIDES:=libmicrohttpd
|
||||
endef
|
||||
|
||||
define Package/libmicrohttpd-ssl
|
||||
@@ -41,6 +42,7 @@ $(call Package/libmicrohttpd/default)
|
||||
TITLE+= with SSL support
|
||||
VARIANT:=ssl
|
||||
DEPENDS:=+libgcrypt +libgnutls +libgpg-error
|
||||
CONFLICTS:=libmicrohttpd-no-ssl
|
||||
PROVIDES:=libmicrohttpd
|
||||
endef
|
||||
|
||||
@@ -76,7 +78,7 @@ define Build/InstallDev
|
||||
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/
|
||||
endef
|
||||
|
||||
define Package/libmicrohttpd/install
|
||||
define Package/libmicrohttpd-no-ssl/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
|
||||
endef
|
||||
@@ -86,5 +88,5 @@ define Package/libmicrohttpd-ssl/install
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libmicrohttpd))
|
||||
$(eval $(call BuildPackage,libmicrohttpd-no-ssl))
|
||||
$(eval $(call BuildPackage,libmicrohttpd-ssl))
|
||||
|
||||
Reference in New Issue
Block a user