uclient: update to Git HEAD (2024-04-19)

[openwrt/openwrt.git] / package / libs / libubox / Makefile

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index be8d921e5e68e783336bf1475634ac2816a7f7f6..22abfd4372e38b49f1049100122f1a768a0266ad 100644 (file)
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -4,10 +4,11 @@ PKG_NAME:=libubox
 PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/libubox.git
-PKG_SOURCE_DATE:=2017-09-12
-PKG_SOURCE_VERSION:=7a1057604ed2ad83434ed3be03728065b14a5e9c
-PKG_MIRROR_HASH:=9040b13684de4343e86190d52c4f1a39e9ccee4b62b8c96075c1764280ce5a29
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
+PKG_MIRROR_HASH:=a4f671d10840fd8487394335636051a6df5edf6d8854af4fcb834a590efb240a
+PKG_SOURCE_DATE:=2024-03-29
+PKG_SOURCE_VERSION:=eb9bcb64185ac155c02cc1a604692c4b00368324
+PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=ISC
@@ -16,6 +17,8 @@ PKG_LICENSE_FILES:=
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_DEPENDS:=lua
+HOST_BUILD_DEPENDS:=libjson-c/host
+HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -25,7 +28,7 @@ define Package/libubox
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Basic utility library
-  ABI_VERSION:=$(PKG_VERSION)
+  ABI_VERSION:=$(PKG_ABI_VERSION)
   DEPENDS:=
 endef
 
@@ -33,6 +36,7 @@ define Package/libblobmsg-json
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=blobmsg <-> json conversion library
+  ABI_VERSION:=$(PKG_ABI_VERSION)
   DEPENDS:=+libjson-c +libubox
 endef
 
@@ -51,6 +55,7 @@ define Package/libjson-script
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libubox
+  ABI_VERSION:=$(PKG_ABI_VERSION)
   TITLE:=Minimalistic JSON based scripting engine
 endef
 
@@ -62,17 +67,18 @@ define Package/libubox-lua
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-CMAKE_OPTIONS = \
-       -DLUAPATH=/usr/lib/lua
+CMAKE_OPTIONS += \
+       -DLUAPATH=/usr/lib/lua \
+       -DABIVERSION="$(PKG_ABI_VERSION)"
 
 define Package/libubox/install
        $(INSTALL_DIR) $(1)/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so.* $(1)/lib/
 endef
 
 define Package/libblobmsg-json/install
        $(INSTALL_DIR) $(1)/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so.* $(1)/lib/
 endef
 
 define Package/jshn/install
@@ -83,7 +89,7 @@ endef
 
 define Package/libjson-script/install
        $(INSTALL_DIR) $(1)/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so.* $(1)/lib/
 endef
 
 define Package/libubox-lua/install
@@ -95,6 +101,17 @@ endef
 CMAKE_HOST_OPTIONS += \
        -DBUILD_LUA=OFF \
        -DBUILD_EXAMPLES=OFF \
+       -DCMAKE_SKIP_RPATH=FALSE \
+       -DCMAKE_MACOSX_RPATH=1 \
+       -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
+
+ifeq ($(HOST_OS),Darwin)
+  define Host/Install
+       $(Host/Install/Default)
+       $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib
+       cd "$(STAGING_DIR_HOSTPKG)/lib" && ln -sf ../../host/lib/libubox.* .
+  endef
+endif
 
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))