ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-01 16:58:22 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

libubox: update to the latest version, set ABI_VERSION dynamically

Browse Source 
2537be018587 cmake: add a possibility to set library version

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Felix Fietkau 2021-02-15 19:18:10 +01:00 committed by maurerr
parent 0b1623c0e1
commit 4dbf0b4162
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/system/ubus/Makefile
View File

@ -5,9 +5,10 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
PKG_SOURCE_DATE:=2020-12-04 PKG_SOURCE_DATE:=2021-02-15
PKG_SOURCE_VERSION:=d1d9ddf98d39b0bdc055060fb962335439445690 PKG_SOURCE_VERSION:=2537be01858710e714c329153760c64fe3f8a73e
PKG_MIRROR_HASH:=6fbdda5144cfef14d314d421ce801e9c89a2266428346f531a57c28e731a059c PKG_MIRROR_HASH:=da1f4959fbe3d51cbc6b7c08b24307f43a80911b395cac834b9f4161c195152f
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_LICENSE:=LGPL-2.1 PKG_LICENSE:=LGPL-2.1
@ -38,7 +39,7 @@ define Package/libubus
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libubox DEPENDS:=+libubox
ABI_VERSION:=20191227 ABI_VERSION:=$(PKG_ABI_VERSION)
TITLE:=OpenWrt RPC client library TITLE:=OpenWrt RPC client library
endef endef
@ -53,7 +54,8 @@ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
TARGET_LDFLAGS += -flto TARGET_LDFLAGS += -flto
CMAKE_OPTIONS = \ CMAKE_OPTIONS = \
-DLUAPATH=/usr/lib/lua -DLUAPATH=/usr/lib/lua \
-DABIVERSION="$(PKG_ABI_VERSION)"
define Package/ubus/install define Package/ubus/install
$(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/bin
@ -67,7 +69,7 @@ endef
define Package/libubus/install define Package/libubus/install
$(INSTALL_DIR) $(1)/lib $(INSTALL_DIR) $(1)/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so.* $(1)/lib/
endef endef
define Package/libubus-lua/install define Package/libubus-lua/install