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

Merge pull request #8569 from bluewavenet/patch-3

Browse source 
libmicrohttpd: Revert to Named no-ssl Version
This commit is contained in:
Rosen Penev 2019-04-15 09:44:36 -07:00 committed by GitHub
commit f885a0d91c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/libmicrohttpd/Makefile
View file

@ -30,10 +30,11 @@ define Package/libmicrohttpd/default
URL:=http://www.gnu.org/software/libmicrohttpd/ URL:=http://www.gnu.org/software/libmicrohttpd/
endef endef
define Package/libmicrohttpd define Package/libmicrohttpd-no-ssl
$(call Package/libmicrohttpd/default) $(call Package/libmicrohttpd/default)
VARIANT:=nossl VARIANT:=nossl
CONFLICTS:=libmicrohttpd-ssl DEFAULT_VARIANT:=1
PROVIDES:=libmicrohttpd
endef endef
define Package/libmicrohttpd-ssl define Package/libmicrohttpd-ssl
@ -41,6 +42,7 @@ $(call Package/libmicrohttpd/default)
TITLE+= with SSL support TITLE+= with SSL support
VARIANT:=ssl VARIANT:=ssl
DEPENDS:=+libgcrypt +libgnutls +libgpg-error DEPENDS:=+libgcrypt +libgnutls +libgpg-error
CONFLICTS:=libmicrohttpd-no-ssl
PROVIDES:=libmicrohttpd PROVIDES:=libmicrohttpd
endef endef
@ -76,7 +78,7 @@ define Build/InstallDev
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/
endef endef
define Package/libmicrohttpd/install define Package/libmicrohttpd-no-ssl/install
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
endef endef
@ -86,5 +88,5 @@ define Package/libmicrohttpd-ssl/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libmicrohttpd)) $(eval $(call BuildPackage,libmicrohttpd-no-ssl))
$(eval $(call BuildPackage,libmicrohttpd-ssl)) $(eval $(call BuildPackage,libmicrohttpd-ssl))