From 0f68fb6e82c2ae85cb341a1301247fa63f55f28d Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 21 Feb 2020 03:03:52 +0800 Subject: [PATCH] libubox: fix ABI_VERSION --- package/ctcgfw/msgpack-c/Makefile | 18 +++++++++--------- package/ctcgfw/tmate/Makefile | 2 +- package/libs/libubox/Makefile | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package/ctcgfw/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile index ab9f22a3de..c96681beae 100644 --- a/package/ctcgfw/msgpack-c/Makefile +++ b/package/ctcgfw/msgpack-c/Makefile @@ -33,25 +33,25 @@ include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS+= -DMSGPACK_BUILD_EXAMPLES:BOOL=OFF -define Package/$(PKG_NAME) +define Package/msgpack-c SECTION:=lib CATEGORY:=Libraries URL:=https://github.com/msgpack/msgpack-c TITLE:=MessagePack implementation for C and C++ / msgpack.org[C/C++] endef -define Package/libmsgpack - $(call Package/$(PKG_NAME)) +define Package/libmsgpack-c + $(call Package/msgpack-c) TITLE+= (Libraries) VARIANT:=lib endef -define Package/$(PKG_NAME)/description +define Package/msgpack-c/description MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller. Small integers are encoded into a single byte and short strings require only one extra byte in addition to the strings themselves. endef -define Package/libmsgpack/description - $(call Package/$(PKG_NAME)/description) +define Package/libmsgpack-c/description + $(call Package/msgpack-c/description) endef define Build/InstallDev @@ -64,10 +64,10 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/CMakeFiles/Export/lib/cmake/msgpack $(1)/usr/lib/cmake/msgpack endef -define Package/libmsgpack/install +define Package/libmsgpack-c/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/libmsgpackc.* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,libmsgpack)) +$(eval $(call BuildPackage,msgpack-c)) +$(eval $(call BuildPackage,libmsgpack-c)) diff --git a/package/ctcgfw/tmate/Makefile b/package/ctcgfw/tmate/Makefile index d008cd525c..4674e23add 100644 --- a/package/ctcgfw/tmate/Makefile +++ b/package/ctcgfw/tmate/Makefile @@ -36,7 +36,7 @@ define Package/$(PKG_NAME) CATEGORY:=Network TITLE:=Instant Terminal Sharing URL:=https://tmate.io - DEPENDS:=+libpthread +libevent2 +libssh +libmsgpack +libncurses + DEPENDS:=+libpthread +libevent2 +libssh +libmsgpack-c +libncurses endef define Package/$(PKG_NAME)/description diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index f5a1f12f22..db99a35aa3 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -27,7 +27,7 @@ define Package/libubox SECTION:=libs CATEGORY:=Libraries TITLE:=Basic utility library - ABI_VERSION:=$(PKG_VERSION) + ABI_VERSION:=20180725 DEPENDS:= endef