diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-01-05 23:30:02 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-01-17 08:52:54 +0100 |
| commit | 3c4df661c0c8d693b5198cbbf61f679c76fdea52 (patch) | |
| tree | 10256cd94536ec270ff2a075cba0cee54ef1728a /tools/cmake/patches/110-alpine_musl-compat.patch | |
| parent | b0d513ec91d76cc6b208094d0f78e54f252de573 (diff) | |
| download | upstream-3c4df661c0c8d693b5198cbbf61f679c76fdea52.tar.gz upstream-3c4df661c0c8d693b5198cbbf61f679c76fdea52.tar.bz2 upstream-3c4df661c0c8d693b5198cbbf61f679c76fdea52.zip | |
tools/cmake: update to 3.10.1
Update cmake to 3.10.1
Refresh patches
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'tools/cmake/patches/110-alpine_musl-compat.patch')
| -rw-r--r-- | tools/cmake/patches/110-alpine_musl-compat.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/cmake/patches/110-alpine_musl-compat.patch b/tools/cmake/patches/110-alpine_musl-compat.patch index ae93201e53..a2c84fca4a 100644 --- a/tools/cmake/patches/110-alpine_musl-compat.patch +++ b/tools/cmake/patches/110-alpine_musl-compat.patch @@ -1,6 +1,6 @@ --- a/Utilities/cmjsoncpp/include/json/assertions.h +++ b/Utilities/cmjsoncpp/include/json/assertions.h -@@ -6,12 +6,12 @@ +@@ -6,11 +6,12 @@ #ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED #define CPPTL_JSON_ASSERTIONS_H_INCLUDED @@ -11,7 +11,6 @@ #endif // if !defined(JSON_IS_AMALGAMATION) -#include <stdlib.h> -- - #if JSON_USE_EXCEPTION - #include <stdexcept> - #define JSON_ASSERT(condition) \ + #include <sstream> + + /** It should not be possible for a maliciously designed file to |