Revert "libwebsockets: sync with master version"
This reverts commit e245e2b824
.
Signed-off-by: Luka Perkov <luka@openwrt.org>
This commit is contained in:
parent
d0763a235f
commit
b3139cf56c
|
@ -8,15 +8,13 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libwebsockets
|
PKG_NAME:=libwebsockets
|
||||||
PKG_VERSION:=2.0.3
|
PKG_VERSION:=1.3-chrome37-firefox30
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)?
|
PKG_SOURCE_URL:=https://github.com/warmcat/libwebsockets.git
|
||||||
PKG_MD5SUM:=a025156d606d90579e65d53ccd062a94
|
|
||||||
|
|
||||||
|
|
||||||
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
|
||||||
|
@ -29,7 +27,8 @@ CMAKE_INSTALL:=1
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
include $(INCLUDE_DIR)/cmake.mk
|
include $(INCLUDE_DIR)/cmake.mk
|
||||||
|
|
||||||
CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF)
|
CMAKE_OPTIONS += $(if $(CONFIG_PACKAGE_kmod-ipv6),,-DLWS_IPV6=)
|
||||||
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=ON
|
CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=ON
|
||||||
|
|
||||||
# other options worth noting
|
# other options worth noting
|
||||||
|
@ -44,8 +43,6 @@ define Package/$(PKG_NAME)/Default
|
||||||
CATEGORY:=Libraries
|
CATEGORY:=Libraries
|
||||||
TITLE:=libwebsockets
|
TITLE:=libwebsockets
|
||||||
DEPENDS:=+zlib
|
DEPENDS:=+zlib
|
||||||
URL:=https://libwebsockets.org
|
|
||||||
MAINTAINER:=Karl Palsson <karlp@etactica.com>
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libwebsockets-openssl
|
define Package/libwebsockets-openssl
|
||||||
|
@ -62,13 +59,6 @@ define Package/libwebsockets-cyassl
|
||||||
VARIANT:=cyassl
|
VARIANT:=cyassl
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libwebsockets-full
|
|
||||||
$(call Package/$(PKG_NAME)/Default)
|
|
||||||
TITLE += (Full - OpenSSL, libuv, plugins, CGI)
|
|
||||||
DEPENDS += +libopenssl +libuv
|
|
||||||
VARIANT:=full
|
|
||||||
endef
|
|
||||||
|
|
||||||
ifeq ($(BUILD_VARIANT),openssl)
|
ifeq ($(BUILD_VARIANT),openssl)
|
||||||
CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
|
CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
|
||||||
CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
|
CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
|
||||||
|
@ -82,21 +72,10 @@ ifeq ($(BUILD_VARIANT),cyassl)
|
||||||
# for cyassl, edit package/libs/cyassl/Makefile to include --enable-opensslextra
|
# for cyassl, edit package/libs/cyassl/Makefile to include --enable-opensslextra
|
||||||
# NOTE: it will compile without it, untested whether it it's needed?!
|
# NOTE: it will compile without it, untested whether it it's needed?!
|
||||||
CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON
|
CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON
|
||||||
CMAKE_OPTIONS += -DLWS_CYASSL_LIBRARIES=$(STAGING_DIR)/usr/lib/libcyassl.so
|
CMAKE_OPTIONS += -DLWS_CYASSL_LIB=$(STAGING_DIR)/usr/lib/libcyassl.so
|
||||||
CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
|
CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_VARIANT),full)
|
|
||||||
CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
|
|
||||||
CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITH_LIBUV=ON
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITH_PLUGINS=ON
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITH_SERVER_STATUS=ON
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITH_ACCESS_LOG=ON
|
|
||||||
CMAKE_OPTIONS += -DLWS_WITH_CGI=ON
|
|
||||||
endif
|
|
||||||
|
|
||||||
define Package/libwebsockets/install
|
define Package/libwebsockets/install
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/
|
||||||
|
@ -104,8 +83,6 @@ endef
|
||||||
|
|
||||||
Package/$(PKG_NAME)-cyassl/install = $(Package/$(PKG_NAME)/install)
|
Package/$(PKG_NAME)-cyassl/install = $(Package/$(PKG_NAME)/install)
|
||||||
Package/$(PKG_NAME)-openssl/install = $(Package/$(PKG_NAME)/install)
|
Package/$(PKG_NAME)-openssl/install = $(Package/$(PKG_NAME)/install)
|
||||||
Package/$(PKG_NAME)-full/install = $(Package/$(PKG_NAME)/install)
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,libwebsockets-openssl))
|
$(eval $(call BuildPackage,libwebsockets-openssl))
|
||||||
$(eval $(call BuildPackage,libwebsockets-cyassl))
|
$(eval $(call BuildPackage,libwebsockets-cyassl))
|
||||||
$(eval $(call BuildPackage,libwebsockets-full))
|
|
||||||
|
|
Loading…
Reference in New Issue