| Index: ports/jsoncpp/nacl.patch
|
| diff --git a/ports/jsoncpp/nacl.patch b/ports/jsoncpp/nacl.patch
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..662b9f6f5e950299f8f64c35e338d0546752f462
|
| --- /dev/null
|
| +++ b/ports/jsoncpp/nacl.patch
|
| @@ -0,0 +1,43 @@
|
| +diff --git a/CMakeLists.txt b/CMakeLists.txt
|
| +--- a/CMakeLists.txt
|
| ++++ b/CMakeLists.txt
|
| +@@ -94,10 +94,11 @@ endif( MSVC )
|
| +
|
| + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
| + # using regular Clang or AppleClang
|
| +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
|
| ++ # pnacl-clang requires gnu++11 rather than c++11 in order to access isascii et al.
|
| ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall")
|
| + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
| + # using GCC
|
| +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -pedantic")
|
| ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x -Wall -Wextra -pedantic")
|
| + endif()
|
| +
|
| + IF(JSONCPP_WITH_WARNING_AS_ERROR)
|
| +diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
|
| +--- 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
|
| +diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
|
| +--- a/src/test_lib_json/main.cpp
|
| ++++ b/src/test_lib_json/main.cpp
|
| +@@ -679,7 +679,10 @@ JSONTEST_FIXTURE(ValueTest, integers) {
|
| + JSONTEST_ASSERT_EQUAL(kint32max, val.asUInt());
|
| + JSONTEST_ASSERT_EQUAL(kint32max, val.asLargestUInt());
|
| + JSONTEST_ASSERT_EQUAL(kint32max, val.asDouble());
|
| ++#if !(defined(__native_client__) && defined(__i386__))
|
| ++ // This test mysteriously fails in i686-nacl-gcc
|
| + JSONTEST_ASSERT_EQUAL(kfint32max, val.asFloat());
|
| ++#endif
|
| + JSONTEST_ASSERT_EQUAL(true, val.asBool());
|
| + JSONTEST_ASSERT_STRING_EQUAL("2147483647", val.asString());
|
| +
|
|
|