X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Flibs%2Flibubox%2FMakefile;h=e3a827c1ab2b74e3b3fcc7028df951a9de811086;hp=83ea2f3b5fc44d9c018abf843e42745a494d45bb;hb=82fbd857471292ca71dc06b05f11089962f33a4f;hpb=0c66367e3fb17dab24ade5be226eb585961df0d0 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 83ea2f3b5f..e3a827c1ab 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -1,25 +1,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libubox -PKG_VERSION:=2015-06-14 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE=4 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=http://git.openwrt.org/project/libubox.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=d1c66ef1131d14f0ed197b368d03f71b964e45f8 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_MD5SUM:= +PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git +PKG_SOURCE_DATE:=2018-07-25 +PKG_SOURCE_VERSION:=c83a84afbef2b24f960ddeda0b5e2ab01fba6981 +PKG_MIRROR_HASH:=4a9594d2ae3706174d182a21fe815f1d18c20beca6593707cc757994975dc670 CMAKE_INSTALL:=1 PKG_LICENSE:=ISC PKG_LICENSE_FILES:= -PKG_MAINTAINER:=Felix Fietkau +PKG_MAINTAINER:=Felix Fietkau 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 include $(INCLUDE_DIR)/cmake.mk define Package/libubox @@ -92,8 +93,17 @@ define Package/libubox-lua/install $(CP) $(PKG_BUILD_DIR)/lua/uloop.so $(1)/usr/lib/lua/ 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)) $(eval $(call BuildPackage,jshn)) $(eval $(call BuildPackage,libjson-script)) $(eval $(call BuildPackage,libubox-lua)) +$(eval $(call HostBuild))