diff options
author | Jörg Krause <joerg.krause@embedded.rocks> | 2015-08-11 09:46:46 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-19 11:05:49 +0200 |
commit | f9280fd9e9f9a4bb108327362559cccac6186b3b (patch) | |
tree | 4a36adb1bdcc865fb4f33dc6c66f45a4e52bb67f /package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch | |
parent | c994d5638310e0a6e5110bd11e51ab0d56188cad (diff) | |
download | buildroot-f9280fd9e9f9a4bb108327362559cccac6186b3b.tar.gz buildroot-f9280fd9e9f9a4bb108327362559cccac6186b3b.zip |
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: Jörg Krause <joerg.krause@embedded.rocks>
Reviewed-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch')
-rw-r--r-- | package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch b/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch deleted file mode 100644 index 7935849214..0000000000 --- a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - |