diff --git a/package/libubox/Config.in b/package/libubox/Config.in index 1f0b691e13..09d6336706 100644 --- a/package/libubox/Config.in +++ b/package/libubox/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_LIBUBOX bool "libubox" depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_JSON_C help This library originates from the OpenWrt project to handle the configuration file infrastructure, but can @@ -11,3 +13,4 @@ config BR2_PACKAGE_LIBUBOX comment "libubox needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/libubox/libubox.hash b/package/libubox/libubox.hash index eb37d33230..127abf432c 100644 --- a/package/libubox/libubox.hash +++ b/package/libubox/libubox.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 df6e1350fd11016ef30242a279cec195d91e6748c11c40e0991593718c46fa52 libubox-3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a-git4.tar.gz +sha256 c4432d4f902bd0a2974d3fe76620bbb5e04b9d52e55701829aa12507651bc4d9 libubox-ecddb31dc34d89be5c9dc4595a4c58070eb090e4-git4.tar.gz diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 00ae2b0595..8710720287 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBUBOX_VERSION = 3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a +LIBUBOX_VERSION = ecddb31dc34d89be5c9dc4595a4c58070eb090e4 LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause LIBUBOX_INSTALL_STAGING = YES -LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) +LIBUBOX_DEPENDENCIES = json-c ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy) LIBUBOX_DEPENDENCIES += lua diff --git a/package/libuci/Config.in b/package/libuci/Config.in index f94d7dc391..25c248751c 100644 --- a/package/libuci/Config.in +++ b/package/libuci/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUCI bool "libuci" depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libubox -> json-c select BR2_PACKAGE_LIBUBOX help This library originates from the OpenWrt project to @@ -14,3 +15,4 @@ config BR2_PACKAGE_LIBUCI comment "libuci needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/ubus/Config.in b/package/ubus/Config.in index 391893e808..21b20abaf3 100644 --- a/package/ubus/Config.in +++ b/package/ubus/Config.in @@ -4,7 +4,7 @@ comment "ubus needs a toolchain w/ dynamic library" config BR2_PACKAGE_UBUS bool "ubus" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libubox -> json-c depends on !BR2_STATIC_LIBS # libubox select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_JSON_C diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in index eeb169a96d..30101f983d 100644 --- a/package/uhttpd/Config.in +++ b/package/uhttpd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_UHTTPD bool "uhttpd" depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libubox -> json-c depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_JSON_C diff --git a/package/uqmi/Config.in b/package/uqmi/Config.in index 21f0bd9077..5029a06800 100644 --- a/package/uqmi/Config.in +++ b/package/uqmi/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UQMI bool "uqmi" - depends on !BR2_STATIC_LIBS # libubox + depends on !BR2_STATIC_LIBS # libubox, libubox -> json-c depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBUBOX diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in index 540e43689f..c328a6ea12 100644 --- a/package/ustream-ssl/Config.in +++ b/package/ustream-ssl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USTREAM_SSL bool "ustream-ssl" - depends on !BR2_STATIC_LIBS #libubox + depends on !BR2_STATIC_LIBS # libubox + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libubox -> json-c select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS help @@ -10,3 +11,4 @@ config BR2_PACKAGE_USTREAM_SSL comment "ustream-ssl needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4