Update cmake to 3.11.0 Remove 110-alpine_musl-compat.patch as it's integrated upstream Rename and refresh patches Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>master
parent
f6e6eadc99
commit
a8c315192b
@ -1,16 +0,0 @@ |
||||
--- a/Utilities/cmjsoncpp/include/json/assertions.h
|
||||
+++ b/Utilities/cmjsoncpp/include/json/assertions.h
|
||||
@@ -6,11 +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>
|
||||
#include <sstream>
|
||||
|
||||
/** It should not be possible for a maliciously designed file to
|
@ -1,6 +1,6 @@ |
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -1130,7 +1130,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
||||
@@ -1149,7 +1149,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
||||
' > "test.c"
|
||||
cmake_original_make_flags="${cmake_make_flags}"
|
||||
if [ "x${cmake_parallel_make}" != "x" ]; then
|
Loading…
Reference in new issue