From patchwork Mon Mar 7 21:08:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 593213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A86431402A1 for ; Tue, 8 Mar 2016 08:06:57 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A9384B92E44; Mon, 7 Mar 2016 22:06:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Mon, 7 Mar 2016 22:06:50 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E0FEFB92E3D for ; Mon, 7 Mar 2016 22:06:48 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .web. - helo: .mout.web. - helo-domain: .web.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mout.web.de (mout.web.de [212.227.17.12]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 7 Mar 2016 22:06:48 +0100 (CET) Received: from tenchi-htpc.lan ([91.66.244.150]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0Lh6M7-1a7Fya31z5-00oUu9 for ; Mon, 07 Mar 2016 22:06:47 +0100 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Mar 2016 22:08:02 +0100 Message-Id: <1457384882-20820-1-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.7.2 X-Provags-ID: V03:K0:CfHOhoa8q17Jbft9orbI267EbVKrM8UJ2QxLs/ACNDYVw3L9AiL H/7YCnLZC2otDa26KQc3ALhNGrLYJPCPmRyhJ4WZdYiaaj+OQ80OahRLKYSuurOtvA0oyHQ awpgCo2c4Mc9dkLdX6dXLiRbswN3d0Y0PPrpg60l+kQ/ogfY7SJlX5aQYck2UoKmry22ozA zRj34vUqCAlYqrJUj/2FQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:XZ7dNiF+uNs=:chO4SL4wPdM09QeyKWkJ9v joYlo76mYZmIEOYDV0pbxDj1Z32gFpPTyfPSK/WVees9C+Y2FoocX+WlOfr+KtydTlJ8ExnSe R1SCgkPzppVP+6DLJbefZT4fMeaJN6K4PqVKxcFvn0elgPS4arHvmYhLk52CAZUQ9/3Yb62VQ YXi1getmKsASpsq5QLTK0AwJ8d7q92RXAk+9BH3OseHstpmAEV+Mhlr0bIBPI4GtDUnl8aNLG kA5SK+7Syzuyy/BirOdVyh3zrYqCAEGfpKiJxwo6UawW/SuFW28D7J0qpzoqbGlmrR3trgvgl pbkDbXQul5lAW8/K198U88d7K151V5kuLL/TWkLWNs0n90rn6sfW56Lby3p+WWedA8jykZD19 Clj5DusVZ8T+JSuwQiRb1EdGCTqz+VyZeRBc4/26/dc5sTPA6fUZzd850UK9aBcUQWbODOJ/Q 0QuxLgtcg+VgaM6D7zaoGTJflyWWMxXko1MVtrLX4Ew7H76Ou7OaB4JuzhJ+UAjCRUTWMis/T qgBiwFjtfFtVUeDJ1ZXFI8tfTKEcqL7/l+Dpjc8DZm/nskj9w9sMIAeOOn0G35VUp0Yzy/WkY pdWgzfsOhJNASurOn9tjPNQ1wV80KuMTmVZN42anxLZwk07CEQZ74m8v697VkGyZD7XqIMBNI T4yAW/SsQ1foSvGdPxe3xGHQMZ7NsXh2wqabiWFwWBOlje1hfv6ppAAhYk2B3oboJgdxyCMVN mzcDxTVRVBUER5dbF4r16ICnaVUdI+XVqR9YVNFezV8upthO66/5Vo/LZnM= Subject: [OpenWrt-Devel] [PATCH] tools/cmake: fix compile on Alpine Linux X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- tools/cmake/patches/120-alpine_musl-compat.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tools/cmake/patches/120-alpine_musl-compat.patch 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 0000000..ae93201 --- /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 ++ + #if !defined(JSON_IS_AMALGAMATION) + #include "config.h" + #endif // if !defined(JSON_IS_AMALGAMATION) + +-#include +- + #if JSON_USE_EXCEPTION + #include + #define JSON_ASSERT(condition) \