From patchwork Thu Nov 26 23:27:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 25380 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 00CA227BBF8; Thu, 26 Nov 2020 23:28:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F2BC927BBF9 for ; Thu, 26 Nov 2020 23:28:08 +0000 (GMT) Received: from localhost ([::1]:40486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiQgK-0004rx-70 for patchwork@mira.cbaines.net; Thu, 26 Nov 2020 18:28:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiQgE-0004rf-Rl for guix-patches@gnu.org; Thu, 26 Nov 2020 18:28:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiQgE-00065M-JU for guix-patches@gnu.org; Thu, 26 Nov 2020 18:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kiQgE-0001KZ-FJ for guix-patches@gnu.org; Thu, 26 Nov 2020 18:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44896] Help with Bear References: <87ft4vvgyy.fsf@debian> In-Reply-To: <87ft4vvgyy.fsf@debian> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Nov 2020 23:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44896@debbugs.gnu.org Received: via spool by 44896-submit@debbugs.gnu.org id=B44896.16064332555075 (code B ref 44896); Thu, 26 Nov 2020 23:28:02 +0000 Received: (at 44896) by debbugs.gnu.org; 26 Nov 2020 23:27:35 +0000 Received: from localhost ([127.0.0.1]:43227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiQfi-0001Jh-Fo for submit@debbugs.gnu.org; Thu, 26 Nov 2020 18:27:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiQfh-0001JU-0X for 44896@debbugs.gnu.org; Thu, 26 Nov 2020 18:27:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52821) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiQfb-0005tS-RW for 44896@debbugs.gnu.org; Thu, 26 Nov 2020 18:27:23 -0500 Received: from [2602:306:8b76:9bc0::3c] (port=49334 helo=debian) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kiQfb-00038X-7V for 44896@debbugs.gnu.org; Thu, 26 Nov 2020 18:27:23 -0500 From: Brett Gilio Date: Thu, 26 Nov 2020 17:27:21 -0600 Message-ID: <87a6v3r95y.fsf@debian> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Disposition: inline; filename=0001-gnu-bear-Update-to-3.0.3.patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From ad64b3febdcd3c98796bb8c5d2ab99add30b9198 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 26 Nov 2020 17:12:10 -0600 Subject: [PATCH 1/1] gnu: bear: Update to 3.0.3. * gnu/packages/build-tools.scm (bear): Update to 3.0.3. INCOMPLETE --- gnu/packages/build-tools.scm | 51 +++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 3f140efdb3..316e992f70 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -38,16 +38,23 @@ #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) + #:use-module (gnu packages gcc) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages package-management) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rpc) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages ninja) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -90,7 +97,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "2.4.4") + (version "3.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -99,16 +106,48 @@ makes a few sacrifices to acquire fast full and incremental build times.") (file-name (git-file-name name version)) (sha256 (base32 - "184dqjcpxiwcfziyi67zzran2c4fal1r3j8nhjdjadcmfxf4389d")))) + "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w")))) (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DCMAKE_CXX_FLAGS=-lspdlog -lstdc++fs" + "-DCMAKE_CXX_STANDARD=17") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-headers + (lambda _ + (substitute* + (list "source/libsys/include/libsys/Os.h" + "source/libsys/include/libsys/Path.h" + "source/libsys/include/libsys/Process.h" + "source/intercept/include/intercept/output/Report.h" + "source/libsys/source/Process.cc" + "source/citnames/source/Configuration.h" + "source/citnames/source/Output.h" + "source/citnames/source/semantic/Semantic.h" + "source/citnames/source/semantic/Tool.h" + "source/bear/main.cc" + "source/citnames/source/Application.cc" + "source/citnames/source/semantic/Tool.cc") + (("") "") + (("std::filesystem") "std::experimental::filesystem")) + #t))))) (inputs - `(("python" ,python-wrapper))) + `(("fmt" ,fmt) + ("grpc" ,grpc) + ("json-modern-cxx" ,json-modern-cxx) + ("protobuf" ,protobuf) + ("spdlog" ,spdlog))) + (native-inputs + `(("googletest" ,googletest) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/rizsotto/Bear") (synopsis "Tool for generating a compilation database") (description "A JSON compilation database is used in the Clang project to -provide information on how a given compilation unit is processed. With this, -it is easy to re-run the compilation with alternate programs. Bear is used to -generate such a compilation database.") +provide information on how a given compilation unit is processed . With this, +it is easy to re-run the compilation with alternate programs . Bear is used to +generate such a compilation database . ") (license license:gpl3+))) (define-public gn