Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10599 from ja-pa/jsoncpp-1.9.2

Browse source 
jsoncpp: update to version 1.9.2
This commit is contained in:
Daniel Engberg 2020-03-23 12:45:12 +01:00 committed by GitHub
commit 6408a0c585
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libs/jsoncpp/Makefile
View file

@ -8,22 +8,27 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=jsoncpp PKG_NAME:=jsoncpp
PKG_VERSION:=1.8.4 PKG_VERSION:=1.9.2
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
PKG_HASH:=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 PKG_HASH:=77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0
PKG_MAINTAINER:= PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include ../../devel/meson/meson.mk
HOSTCC=$(HOSTCC_NOCACHE)
HOSTCXX=$(HOSTCXX_NOCACHE)
define Package/jsoncpp define Package/jsoncpp
SECTION:=libs SECTION:=libs
@ -42,10 +47,14 @@ define Package/jsoncpp/description
convenient format to store user input files. convenient format to store user input files.
endef endef
CMAKE_OPTIONS += \ define Build/InstallDev
-DBUILD_SHARED_LIBS:BOOL=ON \ $(INSTALL_DIR) $(1)/usr/include
-DBUILD_STATIC_LIBS:BOOL=OFF \ $(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
-DJSONCPP_WITH_TESTS:BOOL=OFF $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjsoncpp.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/jsoncpp.pc $(1)/usr/lib/pkgconfig/
endef
define Package/jsoncpp/install define Package/jsoncpp/install
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/

26
libs/jsoncpp/patches/010-pkgconnfig.patch
View file

@ -1,26 +0,0 @@
From 63dc2f77e33e9ff559e051cd2964960b9d3e761e Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 16 Sep 2019 18:38:24 -0700
Subject: [PATCH] pkgconfig: Fix for cross compilation
exec_ and prefix must be overridden in such a case.
Makes the .pc file more consistent with other projects.
---
pkg-config/jsoncpp.pc.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in
index dea51f51..d4fa9ef2 100644
--- a/pkg-config/jsoncpp.pc.in
+++ b/pkg-config/jsoncpp.pc.in
@@ -1,5 +1,7 @@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: jsoncpp
Description: A C++ library for interacting with JSON