From edec5b104e4fe08a6e745b238d3f1a4d9b63cb5a Mon Sep 17 00:00:00 2001 From: Rob White Date: Mon, 1 Apr 2019 21:33:06 +0100 Subject: [PATCH 1/2] libmicrohttpd: Revert to Named no-ssl Version Maintainer: Alexander Couzens lynxis@fe80.eu Compile Tested: Snapshot SDK Run Tested: target - ath79, hardware - gl-ar300m16, package - nodogsplash v3.2.1 and nodogsplash v3.3.1-beta, Openwrt Snapshot. Description: Fix for issue #8180 and resubmitted PR #8563 - Any package with a dependency on the non-ssl version of libmicrohttpd ends up with the ssl version along with libgcrypt, libgnutls, .. This fix reverts the no-ssl version name from libmicrohttpd back to libmicrohttpd-no-ssl as it was in previous versions. The two package names will now be libmicrohttpd-no-ssl and libmicrohttpd-ssl. Signed-off-by: Rob White --- libs/libmicrohttpd/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile index 23aa0a96f..b28b65ffa 100644 --- a/libs/libmicrohttpd/Makefile +++ b/libs/libmicrohttpd/Makefile @@ -30,10 +30,12 @@ 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 + DEFAULT_VARIANT:=1 CONFLICTS:=libmicrohttpd-ssl + PROVIDES:=libmicrohttpd endef define Package/libmicrohttpd-ssl @@ -41,6 +43,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 +79,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 +89,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)) From 753855b8a15f8299ed0c371a861258f584055c4e Mon Sep 17 00:00:00 2001 From: Rob White Date: Thu, 4 Apr 2019 15:31:33 +0100 Subject: [PATCH 2/2] libmicrohttpd: Remove one CONFLICTS statement. Having CONFLICTS for each variant in the other variant causes recursive dependency error, even though the two variants do conflict with each other. This commit removes one of the CONFLICT lines. Build now completes without error on SDK. Signed-off-by: Rob White --- libs/libmicrohttpd/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile index b28b65ffa..3e56be575 100644 --- a/libs/libmicrohttpd/Makefile +++ b/libs/libmicrohttpd/Makefile @@ -34,7 +34,6 @@ define Package/libmicrohttpd-no-ssl $(call Package/libmicrohttpd/default) VARIANT:=nossl DEFAULT_VARIANT:=1 - CONFLICTS:=libmicrohttpd-ssl PROVIDES:=libmicrohttpd endef