diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-18 14:18:31 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-18 14:18:31 +0000 |
| commit | ffd45a9640f7588920de272c1a882f8db2cde7eb (patch) | |
| tree | 82ffa4bd6648e6f7c3ee64864a703514ea043d4f /package/uhttpd/Makefile | |
| parent | cdaf0b7073b20ef0b86c53511337d68fe99a248f (diff) | |
| download | upstream-ffd45a9640f7588920de272c1a882f8db2cde7eb.tar.gz upstream-ffd45a9640f7588920de272c1a882f8db2cde7eb.tar.bz2 upstream-ffd45a9640f7588920de272c1a882f8db2cde7eb.zip | |
[package] uhttpd: support building against openssl instead of cyassl, minor cleanups (#7827)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27686 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/Makefile')
| -rw-r--r-- | package/uhttpd/Makefile | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile index cd1a4771a8..d5dbd0e397 100644 --- a/package/uhttpd/Makefile +++ b/package/uhttpd/Makefile @@ -8,10 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=23 +PKG_RELEASE:=24 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -PKG_BUILD_DEPENDS := libcyassl liblua +PKG_CONFIG_DEPENDS := \ + CONFIG_PACKAGE_uhttpd-mod-tls_cyassl \ + CONFIG_PACKAGE_uhttpd-mod-tls_openssl include $(INCLUDE_DIR)/package.mk @@ -38,13 +40,39 @@ endef define Package/uhttpd-mod-tls $(Package/uhttpd/default) TITLE+= (TLS plugin) - DEPENDS:=uhttpd +libcyassl + DEPENDS:=uhttpd +PACKAGE_uhttpd-mod-tls_cyassl:libcyassl +PACKAGE_uhttpd-mod-tls_openssl:libopenssl endef define Package/uhttpd-mod-tls/description The TLS plugin adds HTTPS support to uHTTPd. endef +define Package/uhttpd-mod-tls/config + choice + depends on PACKAGE_uhttpd-mod-tls + prompt "TLS Provider" + default PACKAGE_uhttpd-mod-tls_cyassl + + config PACKAGE_uhttpd-mod-tls_cyassl + bool "CyaSSL" + + config PACKAGE_uhttpd-mod-tls_openssl + bool "OpenSSL" + endchoice +endef + +UHTTPD_TLS:= +TLS_CFLAGS:= + +ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_cyassl),) + UHTTPD_TLS:=cyassl + TLS_CFLAGS:=-I$(STAGING_DIR)/usr/include/cyassl +endif + +ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_openssl),) + UHTTPD_TLS:=openssl +endif + define Package/uhttpd-mod-lua $(Package/uhttpd/default) @@ -57,10 +85,8 @@ define Package/uhttpd-mod-lua/description endef -# hack to use CyASSL headers -TARGET_CFLAGS += -I$(firstword $(wildcard $(BUILD_DIR)/cyassl-*/include)) -TARGET_LDFLAGS += -lm -MAKE_VARS += FPIC="$(FPIC)" +TARGET_CFLAGS += $(TLS_CFLAGS) +MAKE_VARS += FPIC="$(FPIC)" UHTTPD_TLS="$(UHTTPD_TLS)" define Build/Prepare mkdir -p $(PKG_BUILD_DIR) |