[OpenWrt-Devel] [PATCH] fix the build dependencies for uhttpd and ustream-ssl

thomas.langer at lantiq.com thomas.langer at lantiq.com
Fri Sep 19 08:13:05 EDT 2014


without this change, all 3 ssl libraries are always built,
even if no ssl support was selected in menuconfig

Signed-off-by: Thomas Langer <thomas.langer at lantiq.com>

---
applies for trunk and 14.07 (BB)

diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -32,21 +32,21 @@ endef
 define Package/libustream-openssl
   $(Package/libustream/default)
   TITLE += (openssl)
-  DEPENDS += +libopenssl
+  DEPENDS += +PACKAGE_libustream-openssl:libopenssl
   VARIANT:=openssl
 endef
 
 define Package/libustream-cyassl
   $(Package/libustream/default)
   TITLE += (cyassl)
-  DEPENDS += +libcyassl
+  DEPENDS += +PACKAGE_libustream-cyassl:libcyassl
   VARIANT:=cyassl
 endef
 
 define Package/libustream-polarssl
   $(Package/libustream/default)
   TITLE += (polarssl)
-  DEPENDS += +libpolarssl
+  DEPENDS += +PACKAGE_libustream-polarssl:libpolarssl
   VARIANT:=polarssl
 endef
 
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_VERSION:=dabd7dea6445aaa0e5b8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd at openwrt.org>
 
-PKG_BUILD_DEPENDS = ustream-ssl
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list