From: Felix Fietkau Date: Mon, 15 Feb 2021 17:07:51 +0000 (+0100) Subject: libubox: use build system variable to specify ABI version X-Git-Tag: v21.02.0-rc1~248 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0a497c4640a05bafa7e8115620438bfd4967a973;p=openwrt%2Fopenwrt.git libubox: use build system variable to specify ABI version This removes the need to patch it afterwards Signed-off-by: Felix Fietkau --- 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