diff --git a/cross-openwrt-makefile b/cross-openwrt-makefile index 288704d5..a46bdaff 100644 --- a/cross-openwrt-makefile +++ b/cross-openwrt-makefile @@ -1,102 +1,91 @@ +# +# libwebsockets makefile for openwrt +# - include $(TOPDIR)/rules.mk +include $(TOPDIR)/rules.mk - PKG_NAME:=libwebsockets - PKG_VERSION:=2013-12-18 - PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_NAME:=libwebsockets +PKG_VERSION:=2014-03-01 +PKG_RELEASE=$(PKG_SOURCE_VERSION) - PKG_SOURCE_PROTO:=git - PKG_SOURCE_URL:=git://git.warmcat.com/libwebsockets - PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) - PKG_SOURCE_VERSION:=0a0a7ebc372af8f85c4aec21e2300b62f1b3ffa3 - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - CMAKE_INSTALL:=1 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/warmcat/libwebsockets.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=388dc7d201d8d123841869fb49ec4d94d6dd7f54 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +CMAKE_INSTALL:=1 - include $(INCLUDE_DIR)/package.mk - include $(INCLUDE_DIR)/cmake.mk +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk - define Package/libwebsockets/Default - SECTION:=libs - CATEGORY:=Libraries - TITLE:=libwebsockets - DEPENDS:= +zlib +libopenssl - endef +CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs +CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON +CMAKE_OPTIONS += -DLWS_WITH_SSL=ON +CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=$(if $(CONFIG_PACKAGE_libwebsockets-examples),"OFF","ON") - define Package/libwebsockets/Default/description - libwebsockets - endef +# for cyassl, define these in addition to LWS_OPENSSL_SUPPORT and +# edit package/libs/cyassl/Makefile to include --enable-opensslextra +# CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON +# CMAKE_OPTIONS += -DLWS_CYASSL_LIB=$(STAGING_DIR)/usr/lib/libcyassl.so +# CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include + +# other options worth noting +# CMAKE_OPTIONS += -DLWS_WITHOUT_EXTENSIONS=ON +# CMAKE_OPTIONS += -DLWS_WITHOUT_DAEMONIZE=ON +# CMAKE_OPTIONS += -DLWS_WITHOUT_SERVER=ON +# CMAKE_OPTIONS += -DLWS_WITHOUT_DEBUG=ON - define Package/libwebsockets - $(call Package/libwebsockets/Default) - SECTION:=libs - CATEGORY:=Libraries - TITLE+= (libraries) - endef +define Package/libwebsockets/Default + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libwebsockets + DEPENDS:=+zlib +libopenssl +endef +define Package/libwebsockets + $(call Package/libwebsockets/Default) + TITLE+= (libraries) +endef - define Package/libwebsockets/description - $(call Package/libwebsockets/Default/description) - This package contains libwebsocket libraries - endef +define Package/libwebsockets/description + libwebsockets + This package contains libwebsocket libraries +endef +define Package/libwebsockets-examples + $(call Package/libwebsockets/Default) + DEPENDS:=libwebsockets + TITLE+= (examples) +endef - define Package/libwebsockets-examples - $(call Package/libwebsockets) - DEPENDS:=libwebsockets - TITLE+= (examples) - endef +define Package/libwebsockets-examples/description + libwebsockets examples + This package contains libwebsockets examples +endef +define Package/libwebsockets/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/ +endef - define Package/libwebsockets-examples/description - $(call Package/libwebsockets/Default/description) - This package contains libwebsockets examples. - endef +define Package/libwebsockets-examples/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-client $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-echo $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-fraggle $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-ping $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-server $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-server-extpoll $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/share/libwebsockets-test-server + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/favicon.ico $(1)/usr/share/libwebsockets-test-server/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/leaf.jpg $(1)/usr/share/libwebsockets-test-server/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/libwebsockets.org-logo.png $(1)/usr/share/libwebsockets-test-server/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/libwebsockets-test-server.key.pem $(1)/usr/share/libwebsockets-test-server/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/libwebsockets-test-server.pem $(1)/usr/share/libwebsockets-test-server/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/test.html $(1)/usr/share/libwebsockets-test-server/ +endef - TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include - - define Package/libwebsockets/install - $(INSTALL_DIR) $(1)/usr - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* - $(1)/usr/lib/ - endef - - define Package/libwebsockets-examples/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-client - $(1)/usr/bin/libwebsockets-test-client - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-fraggle - $(1)/usr/bin/libwebsockets-test-fraggle - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-server - $(1)/usr/bin/libwebsockets-test-server - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-echo - $(1)/usr/bin/libwebsockets-test-echo - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-ping - $(1)/usr/bin/libwebsockets-test-ping - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-server- - extpoll $(1)/usr/bin/libwebsockets-test-server-extpoll - - $(INSTALL_DIR) $(1)/usr - $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DIR) $(1)/usr/share/libwebsockets-test-server - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test- - server/favicon.ico $(1)/usr/share/libwebsockets-test-server/favicon.ico - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test- - server/leaf.jpg $(1)/usr/share/libwebsockets-test-server/leaf.jpg - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test- - server/libwebsockets.org-logo.png $(1)/usr/share/libwebsockets-test- - server/libwebsockets.org-logo.png - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server - /libwebsockets-test-server.key.pem $(1)/usr/share/libwebsockets-test- - server/libwebsockets-test-server.key.pem - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server - /libwebsockets-test-server.pem $(1)/usr/share/libwebsockets-test-server - /libwebsockets-test-server.pem - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test- - server/test.html $(1)/usr/share/libwebsockets-test-server/test.html - endef - - $(eval $(call BuildPackage,libwebsockets)) - $(eval $(call BuildPackage,libwebsockets-examples)) +$(eval $(call BuildPackage,libwebsockets)) +$(eval $(call BuildPackage,libwebsockets-examples))