diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2017-09-30 11:00:32 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-30 22:41:12 +0200 |
| commit | 839129b86453f0b0b2b47dac5502ecc3dae7ffb3 (patch) | |
| tree | 390fb5c911ec87150081eacd08098a3a01ec5f4f /tools/cmake/patches/110-alpine_musl-compat.patch | |
| parent | 3adafda07c8509267e3321f4861f620ec3b2f37e (diff) | |
| download | upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.gz upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.bz2 upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.zip | |
tools/cmake: Update to 3.9.3
Update CMake to 3.9.3
Remove FreeBSD patch (not needed)
Rearrage and update patches
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/110-alpine_musl-compat.patch')
| -rw-r--r-- | tools/cmake/patches/110-alpine_musl-compat.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tools/cmake/patches/110-alpine_musl-compat.patch b/tools/cmake/patches/110-alpine_musl-compat.patch new file mode 100644 index 0000000000..ae93201e53 --- /dev/null +++ b/tools/cmake/patches/110-alpine_musl-compat.patch @@ -0,0 +1,17 @@ +--- a/Utilities/cmjsoncpp/include/json/assertions.h ++++ b/Utilities/cmjsoncpp/include/json/assertions.h +@@ -6,12 +6,12 @@ + #ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED + #define CPPTL_JSON_ASSERTIONS_H_INCLUDED + ++#include <stdlib.h> ++ + #if !defined(JSON_IS_AMALGAMATION) + #include "config.h" + #endif // if !defined(JSON_IS_AMALGAMATION) + +-#include <stdlib.h> +- + #if JSON_USE_EXCEPTION + #include <stdexcept> + #define JSON_ASSERT(condition) \ |