From 78b632134f1597e4cc6498a7bb913c4f9b036caf Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Thu, 18 Jun 2020 14:20:15 +0800 Subject: libjson-c: update to 0.14 Update libjson-c to 0.14 Changelog: https://github.com/json-c/json-c/wiki/Notes-for-v0.14-release Switch to CMake because the upstream build system was changed ipk size increased by 2KB Signed-off-by: DENG Qingfang --- package/libs/libjson-c/Makefile | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'package/libs/libjson-c/Makefile') diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile index f02518310a..5e88bba9a3 100644 --- a/package/libs/libjson-c/Makefile +++ b/package/libs/libjson-c/Makefile @@ -8,26 +8,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=json-c -PKG_VERSION:=0.13.1 -PKG_RELEASE:=2 +PKG_VERSION:=0.14 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ -PKG_HASH:=94a26340c0785fcff4f46ff38609cf84ebcd670df0c8efd75d039cc951d80132 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_HASH:=99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:json-c_project:json-c -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 +CMAKE_INSTALL:=1 +CMAKE_OPTIONS += -DCMAKE_INSTALL_INCLUDEDIR=$(STAGING_DIR)/usr/include PKG_MAINTAINER:=Felix Fietkau include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk TARGET_CFLAGS += $(FPIC) -Wno-implicit-fallthrough HOST_CFLAGS += -Wno-implicit-fallthrough @@ -38,22 +37,13 @@ define Package/libjson-c CATEGORY:=Libraries TITLE:=javascript object notation URL:=https://json-c.github.io/json-c/ - ABI_VERSION:=4 + ABI_VERSION:=5 endef define Package/libjson-c/description This package contains a library for javascript object notation backends. endef -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/json-c $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json-c.pc $(1)/usr/lib/pkgconfig/ -endef - define Package/libjson-c/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/ -- cgit v1.2.3