include $(TOPDIR)/rules.mk
PKG_NAME:=libubox
-PKG_RELEASE=1
+PKG_RELEASE=2
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/libubox.git
-PKG_SOURCE_DATE:=2018-01-07
-PKG_SOURCE_VERSION:=1c08e80313fd487112c48346889cc57badeef751
-PKG_MIRROR_HASH:=58cad98de55d44d7791e5d49b809ac5c32d3e6c481dc385b10e02386853f2263
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
+PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca
+PKG_SOURCE_DATE:=2021-05-16
+PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
+PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
CMAKE_INSTALL:=1
+PKG_FLAGS := nonshared
+
PKG_LICENSE:=ISC
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
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Basic utility library
- ABI_VERSION:=$(PKG_VERSION)
+ ABI_VERSION:=$(PKG_ABI_VERSION)
DEPENDS:=
endef
SECTION:=libs
CATEGORY:=Libraries
TITLE:=blobmsg <-> json conversion library
+ ABI_VERSION:=$(PKG_ABI_VERSION)
DEPENDS:=+libjson-c +libubox
endef
SECTION:=utils
CATEGORY:=Utilities
DEPENDS:=+libubox
+ ABI_VERSION:=$(PKG_ABI_VERSION)
TITLE:=Minimalistic JSON based scripting engine
endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
CMAKE_OPTIONS = \
- -DLUAPATH=/usr/lib/lua
+ -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
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
CMAKE_HOST_OPTIONS += \
-DBUILD_LUA=OFF \
-DBUILD_EXAMPLES=OFF \
+ -DCMAKE_SKIP_RPATH=FALSE \
+ -DCMAKE_MACOSX_RPATH=1 \
+ -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
$(eval $(call BuildPackage,libubox))
$(eval $(call BuildPackage,libblobmsg-json))