Skip to content

Commit 8edb179

Browse files
committed
libubox: update to the latest version, set ABI_VERSION dynamically
2537be018587 cmake: add a possibility to set library version Signed-off-by: Felix Fietkau <[email protected]>
1 parent 542eab3 commit 8edb179

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

package/system/ubus/Makefile

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ PKG_RELEASE:=1
55

66
PKG_SOURCE_PROTO:=git
77
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
8-
PKG_SOURCE_DATE:=2020-12-04
9-
PKG_SOURCE_VERSION:=d1d9ddf98d39b0bdc055060fb962335439445690
10-
PKG_MIRROR_HASH:=6fbdda5144cfef14d314d421ce801e9c89a2266428346f531a57c28e731a059c
8+
PKG_SOURCE_DATE:=2021-02-15
9+
PKG_SOURCE_VERSION:=2537be01858710e714c329153760c64fe3f8a73e
10+
PKG_MIRROR_HASH:=da1f4959fbe3d51cbc6b7c08b24307f43a80911b395cac834b9f4161c195152f
11+
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
1112
CMAKE_INSTALL:=1
1213

1314
PKG_LICENSE:=LGPL-2.1
@@ -38,7 +39,7 @@ define Package/libubus
3839
SECTION:=libs
3940
CATEGORY:=Libraries
4041
DEPENDS:=+libubox
41-
ABI_VERSION:=20191227
42+
ABI_VERSION:=$(PKG_ABI_VERSION)
4243
TITLE:=OpenWrt RPC client library
4344
endef
4445

@@ -53,7 +54,8 @@ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
5354
TARGET_LDFLAGS += -flto
5455

5556
CMAKE_OPTIONS = \
56-
-DLUAPATH=/usr/lib/lua
57+
-DLUAPATH=/usr/lib/lua \
58+
-DABIVERSION="$(PKG_ABI_VERSION)"
5759

5860
define Package/ubus/install
5961
$(INSTALL_DIR) $(1)/bin
@@ -67,7 +69,7 @@ endef
6769

6870
define Package/libubus/install
6971
$(INSTALL_DIR) $(1)/lib
70-
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
72+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so.* $(1)/lib/
7173
endef
7274

7375
define Package/libubus-lua/install

0 commit comments

Comments
 (0)