From 5e0587b8d1274096620031951f0fe0449913740d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 7 Apr 2024 11:15:23 +0200 Subject: [PATCH] uclient: update to Git HEAD (2024-04-05) e209a4ced1d8 add strdupa macro for compatibility af1962b9a609 uclient: add helper function for getting ustream-ssl context/ops 488f1d52cfd2 http: add helper function for checking redirect status b6e5548a3ecc uclient: defer read notifications to uloop timer 352fb3eeb408 http: call ustream_poll if not enough read data is available e611e6d0ff0b add ucode binding ddb18d265757 uclient: add function for getting the amount of pending read/write data 980220ad1762 ucode: fix a few ucode binding issues 6c16331e4bf5 ucode: add support for using a prototype for cb, pass it to callbacks Signed-off-by: Felix Fietkau --- package/libs/uclient/Makefile | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libs/uclient/Makefile b/package/libs/uclient/Makefile index 8a977a7aa725..cb679231cc3c 100644 --- a/package/libs/uclient/Makefile +++ b/package/libs/uclient/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uclient.git -PKG_MIRROR_HASH:=798f77d47695f7aaf7397072be2d2359c69ef53993e1b1910074cdacaa1d17e2 -PKG_SOURCE_DATE:=2023-04-13 -PKG_SOURCE_VERSION:=007d945467499f43656b141171d31f5643b83a6c +PKG_MIRROR_HASH:=21c95854c60757007edacc579ce874999d2d536f682b0e636a8d19bc75e70da5 +PKG_SOURCE_DATE:=2024-04-05 +PKG_SOURCE_VERSION:=6c16331e4bf542fbb538d62a6b5bf3d286ecbf2c CMAKE_INSTALL:=1 PKG_BUILD_DEPENDS:=ustream-ssl @@ -16,6 +16,7 @@ PKG_LICENSE:=ISC PKG_LICENSE_FILES:= PKG_MAINTAINER:=Felix Fietkau +PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_ucode-mod-uclient include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -37,6 +38,16 @@ define Package/uclient-fetch DEPENDS:=+libuclient endef +define Package/ucode-mod-uclient + SECTION:=utils + CATEGORY:=Utilities + TITLE:=ucode uclient module + DEPENDS:=+libucode +libuclient +endef + +CMAKE_OPTIONS += \ + -DBUILD_UCODE=$(if $(CONFIG_PACKAGE_ucode-mod-uclient),ON,OFF) + define Package/libuclient/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libuclient.so $(1)/usr/lib/ @@ -47,5 +58,11 @@ define Package/uclient-fetch/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uclient-fetch $(1)/bin/ endef +define Package/ucode-mod-uclient/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/*.so $(1)/usr/lib/ucode +endef + $(eval $(call BuildPackage,libuclient)) $(eval $(call BuildPackage,uclient-fetch)) +$(eval $(call BuildPackage,ucode-mod-uclient))