aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-03-10 19:12:15 +0000
committerJohn Crispin <john@openwrt.org>2016-03-10 19:12:15 +0000
commit63dc46aa3a07be9259814a268e0f0e011af597a9 (patch)
treef8e092b137d79d148faca6e076e75473a00ab920
parentbe7962925927ab5cdc7a13fdb24d1b08792f8f23 (diff)
downloadupstream-63dc46aa3a07be9259814a268e0f0e011af597a9.tar.gz
upstream-63dc46aa3a07be9259814a268e0f0e011af597a9.tar.bz2
upstream-63dc46aa3a07be9259814a268e0f0e011af597a9.zip
tools/cmake: fix compile on Alpine Linux
internal jsoncpp include order leads to multiple build errors on Alpine Linux which uses musl libc use include order from upstream jsoncpp first error was: In file included from /usr/include/c++/5.3.0/stdexcept:38:0, from /home/..../openwrt/build_dir/host/cmake-3.4.3/Utilities/cmjsoncpp/include/json/assertions.h:16, from /home/..../openwrt/build_dir/host/cmake-3.4.3/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp:7: /usr/include/c++/5.3.0/exception:35:9: error: '#pragma' is not allowed here #pragma GCC visibility push(default) Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> SVN-Revision: 48995
-rw-r--r--tools/cmake/patches/120-alpine_musl-compat.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/tools/cmake/patches/120-alpine_musl-compat.patch b/tools/cmake/patches/120-alpine_musl-compat.patch
new file mode 100644
index 0000000000..ae93201e53
--- /dev/null
+++ b/tools/cmake/patches/120-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) \