aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-02-15 18:07:51 +0100
committerFelix Fietkau <nbd@nbd.name>2021-02-15 18:47:19 +0100
commit0a497c4640a05bafa7e8115620438bfd4967a973 (patch)
tree24bc38b716bd2082d1a3e9e5146a4109ea2d4f38
parent95359dac827d175a61d0986a88feb5e4927fcb60 (diff)
downloadupstream-0a497c4640a05bafa7e8115620438bfd4967a973.tar.gz
upstream-0a497c4640a05bafa7e8115620438bfd4967a973.tar.bz2
upstream-0a497c4640a05bafa7e8115620438bfd4967a973.zip
libubox: use build system variable to specify ABI version
This removes the need to patch it afterwards Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/libs/libubox/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 19d9145509..4d582eacfd 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -68,16 +68,17 @@ 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
@@ -88,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