From patchwork Thu Dec 10 21:54:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1414579 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=YEnBqMf8; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CsSP34WM0z9sSf for ; Fri, 11 Dec 2020 08:54:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4202A87193; Thu, 10 Dec 2020 21:54:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id osQd1QzKFXWK; Thu, 10 Dec 2020 21:54:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9C0C187196; Thu, 10 Dec 2020 21:54:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DCDB51BF358 for ; Thu, 10 Dec 2020 21:54:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D985286937 for ; Thu, 10 Dec 2020 21:54:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hPnb+AGwsTzd for ; Thu, 10 Dec 2020 21:54:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id 938E78682D for ; Thu, 10 Dec 2020 21:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1607637246; bh=GtDdCRCqw7grqKR4Ba60vLEbFGZWXRlWcfAVo1i/EjQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=YEnBqMf8GM5PKAEUDV9zjbPVa6MQgu7elXA4WJk2NKKIN1GhBHq8JIcwZm+Ws/meD KxuPAlS4REHVf8hYvDzSooMWbVj/hutj4pR4CesQQcw3Mr6wWsMzKcr0LaGluN5dUo OvJxY5jReyVbYHHL1ezjrm1ZQHYBhpB97cGQU0uo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.229]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MqaxU-1kIYu60HlA-00mapF; Thu, 10 Dec 2020 22:54:06 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Thu, 10 Dec 2020 22:54:05 +0100 Message-Id: <20201210215405.12318-1-ps.report@gmx.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:IXq742faqpwk2OZJQquUxqrXOgyUCffVUM4jMvxtuEWPie7URHv O9xzcZoO2zfnLy48lEmwUCfqkO8+y4/otm/vSpcIycZgesOa5JFU7hSK/MBimU9h4YjGgMS CIdwoespXPpZEpptZ3ID6ObSX35rr+kBkRDWi+yOVO8LuowaAigoAN9hEIlQ6rVLBGWDaPq loN4A3iX6FX89UbLLkXQA== X-UI-Out-Filterresults: notjunk:1;V03:K0:qLYd1FzpJYI=:sTRV49E+g8ffoCL7gb71x4 PSK9PMCwVT8dUsAg9JpTqi3mUmPGd8VowcAcojPlzKeafqf0iYQnZWfSASGC3ZlOL2SUbH69D YLu+uI5r/wRNXfEgsZ2eN18B+PwefvyDqR5xceQlCfjkFZrzpbMwdrcmdFTiWi90JWFPMTneW EqPFv387AWQ9WCiobUTtbhkib/Wr7IBT4x6BGSULmYEiMwkuWsO+LMJBBPgw3v3/lcrjPwk2j aTdCqcxz5eRMf09d0XBVO87RIJbC8VAh+ZL/oHqWVlbt7+ExxrTUeKdPF2hFfv2nDcFXQSrcM XdW6WVV2oO377o5+t9uKt1BSqdUzqTUsPE2cpKpoZvAHjSyDhEen/SlcObHVosLHa/tltcVyh jHn3I46U4lVT8M0BSBFqi4Qc7g+rHufJc8GZ6djs7hXaAv1e/4wXoGx8JGM5zEMseMABxtAPc mPS5eXRRjKCuvpHqyrbnejBlxyLONR0Ubvy43lCEKgNChLNjc/T5CMJSsDkaNkximBv+yYqK0 BWLFg3BNNHlPN39tS3EoJYdesNb6/0a1YhQys7aUEXSvhJ2OZe/rrhkaPw3j/K3gKVJl1pTkr +85cnqs30OFEedQmXNUtbBqIw2GSZf++fDkTrGqp7HFRyjEK31wcczvKKGQ7dR56kbDBZgVga IeVlJMulK9OtWRg5UvkBrdQjeTtMxpRnMrCEns/jsp9NlmIirKHXm9QKPhbMYs0/t4+Fo2Ynp CMEAdNsLU0R6/Ou6VpkPvkgOGAs/6J5m8GAcm7PvWiz7BttrOs1OeZkUUfjz4EqWzdQ34uXMU tEA3iPwgeIOuDxz8vf03IMU7qW5eLNqKTTwtbH8P58AYXk/nG5FZCI+pbl9o8xtWt0WXATVeu ot7cx9oTkTNk1aQLWZSw== Subject: [Buildroot] [RFC v2] package/ninja: fix to be cmake-3.10 compatible again X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes (see [1]): ToDo: ... [1] http://lists.busybox.net/pipermail/buildroot/2020-December/298159.html Signed-off-by: Peter Seiderer Reviewed-by: Yegor Yefremov --- Changes v1 -> v2: - really use COMPILE_FLAGS (as the patch subject says) (suggested by Yegor Yefremov) --- ...onform-COMPILE_FLAGS-instead-of-3.15.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/ninja/0004-use-cmake-3.10-conform-COMPILE_FLAGS-instead-of-3.15.patch diff --git a/package/ninja/0004-use-cmake-3.10-conform-COMPILE_FLAGS-instead-of-3.15.patch b/package/ninja/0004-use-cmake-3.10-conform-COMPILE_FLAGS-instead-of-3.15.patch new file mode 100644 index 0000000000..d92959a938 --- /dev/null +++ b/package/ninja/0004-use-cmake-3.10-conform-COMPILE_FLAGS-instead-of-3.15.patch @@ -0,0 +1,27 @@ +From 71840d514511291410d514790c25956be9d4dfe5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 10 Dec 2020 20:29:19 +0100 +Subject: [PATCH] use cmake-3.10 conform COMPILE_FLAGS instead of 3.15 + INCLUDE_DIRECTORIES property + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f03c35..f582d2f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,7 +156,7 @@ if(platform_supports_ninja_browse) + set_source_files_properties(src/browse.cc + PROPERTIES + OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/build/browse_py.h" +- INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}" ++ COMPILE_FLAGS "-I${CMAKE_BINARY_DIR}" + COMPILE_DEFINITIONS NINJA_PYTHON="python" + ) + endif() +-- +2.29.2 +