diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2015-07-25 21:36:57 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-26 15:48:48 +0200 |
| commit | 87932844f7e31a9dc53e00a05ac1bc8a6c69c15a (patch) | |
| tree | 9a53ade906540466ec2a5a8329561bca0e222877 /package/libubox | |
| parent | d41465a7b533cff2bdfe23012da246493dcc14ec (diff) | |
| download | buildroot-87932844f7e31a9dc53e00a05ac1bc8a6c69c15a.tar.gz buildroot-87932844f7e31a9dc53e00a05ac1bc8a6c69c15a.zip | |
libubox: bump version
Change upstream location and remove upstreamed patches.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libubox')
| -rw-r--r-- | package/libubox/0001-drop-legacy-json-c.patch | 34 | ||||
| -rw-r--r-- | package/libubox/libubox.mk | 4 |
2 files changed, 2 insertions, 36 deletions
diff --git a/package/libubox/0001-drop-legacy-json-c.patch b/package/libubox/0001-drop-legacy-json-c.patch deleted file mode 100644 index 84bd99a6e2..0000000000 --- a/package/libubox/0001-drop-legacy-json-c.patch +++ /dev/null @@ -1,34 +0,0 @@ -[PATCH] libubox: drop legacy json-c support - -The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all -modules are found), and the legacy libjson.so name is also used by the other -libjson (http://sourceforge.net/projects/libjson/) which provides an -incompatible API, so just drop it. - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: libubox-bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b/CMakeLists.txt -=================================================================== ---- libubox-bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b.orig/CMakeLists.txt -+++ libubox-bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b/CMakeLists.txt -@@ -13,7 +13,7 @@ - ENDIF() - - INCLUDE(FindPkgConfig) --PKG_CHECK_MODULES(JSONC json-c json) -+PKG_CHECK_MODULES(JSONC json-c) - IF(JSONC_FOUND) - ADD_DEFINITIONS(-DJSONC) - INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS}) -@@ -42,7 +42,7 @@ - - ADD_SUBDIRECTORY(lua) - --find_library(json NAMES json-c json) -+find_library(json NAMES json-c) - IF(EXISTS ${json}) - ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c) - TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json}) diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 5d9c01d2b8..4c56951a3d 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUBOX_VERSION = 5a0bbefc8fa440446253b171d0ac038d839360e3 -LIBUBOX_SITE = git://nbd.name/luci2/libubox.git +LIBUBOX_VERSION = e88d816d6e462180f0337565e04e36be58a63309 +LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT LIBUBOX_INSTALL_STAGING = YES LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) |
