From f9280fd9e9f9a4bb108327362559cccac6186b3b Mon Sep 17 00:00:00 2001 From: Jörg Krause Date: Tue, 11 Aug 2015 09:46:46 +0200 Subject: package/jsoncpp: bump to version 1.6.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Bernd Kuhls Signed-off-by: Jörg Krause Reviewed-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/jsoncpp/0001-Remove-Werror.patch | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/jsoncpp/0001-Remove-Werror.patch (limited to 'package/jsoncpp/0001-Remove-Werror.patch') diff --git a/package/jsoncpp/0001-Remove-Werror.patch b/package/jsoncpp/0001-Remove-Werror.patch new file mode 100644 index 0000000000..178cbbf78f --- /dev/null +++ b/package/jsoncpp/0001-Remove-Werror.patch @@ -0,0 +1,39 @@ +From d7b84f69c5e92178e110552cce27f900744e1779 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +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 +--- + 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 + -- cgit v1.2.3