Commit f9280fd9 authored by Jörg Krause's avatar Jörg Krause Committed by Thomas Petazzoni
Browse files

package/jsoncpp: bump to version 1.6.5 

Remove patch 0001-Revert-Use-std-namespace-for-snprintf.patch:
This patch was initially intented to remove upstream commit
1c58876185d2a4ed87dac4a54b82f607e74f55fd to disable std::snprintf() for all
compilers. However, the patch actually reverts upstream commit
240ddb6a1b7aae7c6528e328995812ee695a73af which only uses std namespace if the
compiler defines __cplusplus >= 201103L, thus is a recent C++11 compiler.

Furthermore, upstream commit fac87108a49fb1b2640eff5d8e4cc7a12723a510 adds
the `-std=c++11` compiler flag to gcc, so jsoncpp now requires a C++11 compiler
either way.

With jsoncpp requiring a recent C++11 compiler we need at least gcc 4.7.

Backport patch from upstream [1] to remove `-Werror` from the compiler flags to
allow building with CS ARM toolchains.

[1]
https://github.com/open-source-parsers/jsoncpp/commit/d7b84f69c5e92178e110552cce27f900744e1779



Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarJörg Krause <joerg.krause@embedded.rocks>
Reviewed-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c994d563

package/jsoncpp/0001-Remove-Werror.patch

0 → 100644
+39 −0
Original line number Diff line number Diff line 
From d7b84f69c5e92178e110552cce27f900744e1779 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>

Date: Thu, 30 Jul 2015 23:47:05 +0200

Subject: [PATCH 1/1] Remove Werror

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit



-Werror shouldn't be used in released code since it can cause random build

failures on moderate warnings. It also depends on the used toolchain since

different toolchains may or may not print the same warnings.



Backported from: d7b84f69c5e92178e110552cce27f900744e1779



Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

---

 CMakeLists.txt | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/CMakeLists.txt b/CMakeLists.txt

index cab0de8..62bf203 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -97,10 +97,10 @@ endif( MSVC )

 

 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

   # using regular Clang or AppleClang

-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wno-sign-conversion")

+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wno-sign-conversion")

 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

   # using GCC

-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wextra -pedantic")

+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra -pedantic")

   # not yet ready for -Wsign-conversion

 endif()

 

-- 

2.5.0

package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
From 29bfb6ac06b7304d326e3b70fc0209a702b89d83 Mon Sep 17 00:00:00 2001

From: Baruch Siach <baruch@tkos.co.il>

Subject: [PATCH] Revert "Use std namespace for snprintf."



This reverts commit 1c58876185d2a4ed87dac4a54b82f607e74f55fd.



std::snprintf() is only available in C++11, which is not provided by

all compilers. Since the C library snprintf() can easily be used as a

replacement on Linux systems, this patch changes jsoncpp to use the C

library snprintf() instead of C++11 std::snprintf(), fixing the build error

below:



src/lib_json/json_writer.cpp:33:18: error: 'snprintf' is not a member of 'std'



Upstream status: sent upstream

package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch



Signed-off-by: Baruch Siach <baruch@tkos.co.il>

---



 src/lib_json/json_writer.cpp | 2 --

 1 file changed, 2 deletions(-)



diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp

index 83102fd2bb86..f7ad1e21bbc0 100644

--- a/src/lib_json/json_writer.cpp

+++ b/src/lib_json/json_writer.cpp

@@ -29,8 +29,6 @@

 

 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below

 #define snprintf _snprintf

-#elif __cplusplus >= 201103L

-#define snprintf std::snprintf

 #endif

 

 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0

-- 

2.1.4

package/jsoncpp/Config.in

+3 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_JSONCPP

	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11

	depends on BR2_INSTALL_LIBSTDCPP

	bool "jsoncpp"

	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_JSONCPP 


	  https://github.com/open-source-parsers/jsoncpp



comment "jsoncpp needs a toolchain w/ C++"

	depends on !BR2_INSTALL_LIBSTDCPP
 
comment "jsoncpp needs a toolchain w/ C++, gcc >= 4.7"

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7

package/jsoncpp/jsoncpp.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



JSONCPP_VERSION = 1.6.1

JSONCPP_VERSION = 1.6.5

JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))

JSONCPP_LICENSE = Public Domain or MIT

JSONCPP_LICENSE_FILES = LICENSE