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

Merge pull request #5929 from cotequeiroz/nixio-remove-tls

Browse source 
luci-lib-nixio: always build without TLS support
This commit is contained in:
Jo-Philipp Wich 2022-08-10 23:46:33 +02:00 committed by GitHub
commit 1f777bd479
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libs/luci-lib-nixio/Makefile
View file

@ -7,48 +7,10 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=NIXIO POSIX library LUCI_TITLE:=NIXIO POSIX library
LUCI_DEPENDS:=+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl +liblua LUCI_DEPENDS:=+liblua
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
define Package/luci-lib-nixio/config
choice
prompt "TLS Provider"
default PACKAGE_luci-lib-nixio_notls
config PACKAGE_luci-lib-nixio_notls
bool "Disabled"
config PACKAGE_luci-lib-nixio_axtls
bool "Builtin (axTLS)"
config PACKAGE_luci-lib-nixio_cyassl
bool "CyaSSL"
select PACKAGE_libcyassl
config PACKAGE_luci-lib-nixio_openssl
bool "OpenSSL"
select PACKAGE_libopenssl
endchoice
endef
NIXIO_TLS:=
ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_axtls),)
NIXIO_TLS:=axtls
endif
ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_openssl),)
NIXIO_TLS:=openssl
endif
ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),)
NIXIO_TLS:=cyassl
LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl
endif
MAKE_VARS += NIXIO_TLS="$(NIXIO_TLS)"
include ../../luci.mk include ../../luci.mk
# call BuildPackage - OpenWrt buildroot signature # call BuildPackage - OpenWrt buildroot signature