From patchwork Fri Apr 9 15:50:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 28424 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 9031427BC6F; Fri, 9 Apr 2021 18:23:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,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 A6CF827BC6E for ; Fri, 9 Apr 2021 18:23:13 +0100 (BST) Received: from localhost ([::1]:58724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUuqe-0002dD-KV for patchwork@mira.cbaines.net; Fri, 09 Apr 2021 13:23:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUuqU-0002bt-A0 for guix-patches@gnu.org; Fri, 09 Apr 2021 13:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUuqU-0002cx-2y for guix-patches@gnu.org; Fri, 09 Apr 2021 13:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUuqT-0004BD-Ve for guix-patches@gnu.org; Fri, 09 Apr 2021 13:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47676] [PATCH] Add 'compiler-for-target' checker Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Apr 2021 17:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47676 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47676@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161798894116019 (code B ref -1); Fri, 09 Apr 2021 17:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Apr 2021 17:22:21 +0000 Received: from localhost ([127.0.0.1]:50823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUupl-0004AE-N7 for submit@debbugs.gnu.org; Fri, 09 Apr 2021 13:22:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:58522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUupj-0004A6-PS for submit@debbugs.gnu.org; Fri, 09 Apr 2021 13:22:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUupj-0001ni-It for guix-patches@gnu.org; Fri, 09 Apr 2021 13:22:15 -0400 Received: from laurent.telenet-ops.be ([2a02:1800:110:4::f00:19]:50072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUupg-0001uu-Ph for guix-patches@gnu.org; Fri, 09 Apr 2021 13:22:15 -0400 Received: from butterfly.local ([213.251.114.97]) by laurent.telenet-ops.be with bizsmtp id qhNB240022695yl01hNBAq; Fri, 09 Apr 2021 19:22:11 +0200 Message-ID: <5b5860a8002b66818f6619bbe3c1a4a0f19d6246.camel@telenet.be> From: Maxime Devos Date: Fri, 09 Apr 2021 17:50:35 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.34.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1617988932; bh=c0nA4fXCtaiXigv94ipTsnzVFI+FDn4n+v01kC50rd8=; h=Subject:From:To:Date; b=h+9JQILi6kndk/0hZcsvrIK9f8gtaBOOhqrSHO9HI8ccS/vJ7CP/csuhTBWVsbZUB 2cAcKGS6HtW1K65z2uCM1aBL604KPI7ICEuHta1DtGl4JcR1nxUhpdTDvJKV9Ewct3 ta2dhlsJKM+OQWlkHhnEzDhrJCYOF0iH1o3wzJQR032r209bjIfWMYsLeYvkUWA+Tv kQOHenRJXanbfYHb7fLKytEvfrTFxXIQ9omGvikjBv3AF5rPgSNJkFAm5EEdj3LjWG UEnP1Cn/yaBF8Gw+IfngfVpcGwF72DCCl0nJIou30oxmknhVFx6QP4UOAJDru/ZeSb kJHnPlwkG/inA== Received-SPF: pass client-ip=2a02:1800:110:4::f00:19; envelope-from=maximedevos@telenet.be; helo=laurent.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi Guix, This patch series adds a linter that detects "CC=gcc" and "CXX=g++" in #:make-flags in the arguments field of a package. This is incorrect when cross-compiling; ,(string-append "CC=" (cc-for-target)) or similar should be used instead. Patch #1: detect "CC=gcc". Patch #2: detect "CXX=g++". Some complaints from the checker: $ ./pre-inst-env guix lint -c "compiler-for-target" > gnu/packages/admin.scm:3138:5: sunxi-tools@1.4.2: should use 'cc-for-target' > gnu/packages/admin.scm:2969:5: cbatticon@1.6.10: should use 'cc-for-target' > gnu/packages/assembly.scm:230:5: dev86@0.16.21: should use 'cc-for-target' > gnu/packages/audio.scm:4870:4: lv2toweb@0.4: should use 'cc-for-target' > gnu/packages/audio.scm:1134:5: swh-plugins-lv2@1.0.16: should use 'cc-for-target' > gnu/packages/base.scm:1290:5: tzdata@2021a: should use 'cc-for-target' > gnu/packages/bioinformatics.scm:10977:5: paml@4.9e: should use 'cc-for-target' > gnu/packages/bioinformatics.scm:1677:5: bowtie1@1.3.0: should use 'cc-for-target' > gnu/packages/bioinformatics.scm:4885:5: mash@2.1: should use 'cc-for-target' > [...] "make && make check TESTS=tests/lint.scm" succeeds. Greetings, Maxime. From c28c9383afeea102f43aa40ea466bba4e32516bf Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 9 Apr 2021 17:17:01 +0200 Subject: [PATCH 2/2] lint: Extend 'compiler-for-target' to detect CXX=g++. * guix/lint.scm (check-compiler-for-target): Detect "CXX=g++". * tests/lint.scm ("compiler-for-target: no warnings (cxx-for-target)") ("compiler-for-target: warning (hardcoded CC=g++)"): New test cases. --- guix/lint.scm | 33 +++++++++++++++++++++++---------- tests/lint.scm | 19 ++++++++++++++++++- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index bf9acb40be..1f32ff8393 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1366,16 +1366,29 @@ host compiler." ;; support all patterns. (make-flags/evaluated (false-if-exception - (evaluate-argument make-flags package))) - (cc (any (lambda (x) - (and (string-prefix? "CC=" x) - (substring x 3))) - make-flags/evaluated))) - (and cc (string=? cc "gcc") - (list - (make-warning package - (G_ "should use 'cc-for-target'") - #:field 'arguments)))) + (evaluate-argument make-flags package)))) + (let ((cc (any (lambda (x) + (and (string-prefix? "CC=" x) + (substring x 3))) + make-flags/evaluated)) + (cxx (any (lambda (x) + (and (string-prefix? "CXX=" x) + (substring x 4))) + make-flags/evaluated))) + ;; GNU's C compiler + `(,@(if (and cc (string=? cc "gcc")) + (list + (make-warning package + (G_ "should use 'cc-for-target'") + #:field 'arguments)) + '()) + ;; GNU's C++ compiler + ,@(if (and cxx (string=? cxx "g++")) + (list + (make-warning package + (G_ "should use 'cxx-for-target'") + #:field 'arguments)) + '())))) '())) (package-arguments package)))) diff --git a/tests/lint.scm b/tests/lint.scm index bda12063bc..7aa17f060a 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -40,7 +40,7 @@ #:use-module (guix swh) #:use-module ((guix gexp) #:select (local-file)) #:use-module ((guix utils) #:select (call-with-temporary-directory - cc-for-target)) + cc-for-target cxx-for-target)) #:use-module ((guix import hackage) #:select (%hackage-url)) #:use-module ((guix import stackage) #:select (%stackage-url)) #:use-module (gnu packages) @@ -1117,6 +1117,14 @@ (arguments `(#:make-flags (list ,(string-append "CC=" (cc-for-target)))))))) +(test-equal "compiler-for-target: no warnings (cxx-for-target)" + '() + (check-compiler-for-target + (package + (inherit (dummy-package "x")) + (arguments + `(#:make-flags (list ,(string-append "CXX=" (cxx-for-target)))))))) + (test-equal "compiler-for-target: warning (hardcoded CC=gcc)" "should use 'cc-for-target'" (single-lint-warning-message @@ -1126,6 +1134,15 @@ (arguments `(#:make-flags '("CC=gcc"))))))) +(test-equal "compiler-for-target: warning (hardcoded CC=g++)" + "should use 'cxx-for-target'" + (single-lint-warning-message + (check-compiler-for-target + (package + (inherit (dummy-package "x")) + (arguments + `(#:make-flags '("CXX=g++"))))))) + (test-end "lint") ;; Local Variables: -- 2.31.1