Revert "libubox: use PKG_ABI_VERSION"

[openwrt/staging/dedeckeh.git] / package / libs / libubox / Makefile

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 8e6d0368e35547caf6abd26b0990a2f43f499719..d9c239a50d15eb8475e9d5e247d900c0162275e0 100644 (file)
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_RELEASE=2
+PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
-PKG_SOURCE_DATE:=2018-04-12
-PKG_SOURCE_VERSION:=6eff829d788b36939325557066f58aafd6a05321
-PKG_MIRROR_HASH:=d0ea16385a133d668d18d793d0bffd867a8c799832a176f0a312c1b473ff918d
+PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
+PKG_SOURCE_DATE:=2020-12-12
+PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=ISC
@@ -17,6 +17,7 @@ PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_DEPENDS:=lua
 HOST_BUILD_DEPENDS:=libjson-c/host
+HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -26,7 +27,7 @@ define Package/libubox
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Basic utility library
-  ABI_VERSION:=$(PKG_VERSION)
+  ABI_VERSION:=20201212
   DEPENDS:=
 endef
 
@@ -96,6 +97,9 @@ endef
 CMAKE_HOST_OPTIONS += \
        -DBUILD_LUA=OFF \
        -DBUILD_EXAMPLES=OFF \
+       -DCMAKE_SKIP_RPATH=FALSE \
+       -DCMAKE_MACOSX_RPATH=1 \
+       -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
 
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))