Commit 87932844 authored by Yegor Yefremov's avatar Yegor Yefremov Committed by Thomas Petazzoni
Browse files

libubox: bump version 



Change upstream location and remove upstreamed patches.

Signed-off-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent d41465a7

package/libubox/0001-drop-legacy-json-c.patch

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
[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})

package/libubox/libubox.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)