From patchwork Sat Apr 10 18:03:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 28447 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 6114227BC71; Sat, 10 Apr 2021 19:05:51 +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 B10A327BC70 for ; Sat, 10 Apr 2021 19:05:49 +0100 (BST) Received: from localhost ([::1]:42124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVHzQ-0005Wt-Ma for patchwork@mira.cbaines.net; Sat, 10 Apr 2021 14:05:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVHyg-0005VE-Rp for guix-patches@gnu.org; Sat, 10 Apr 2021 14:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVHyg-0003zF-Jg for guix-patches@gnu.org; Sat, 10 Apr 2021 14:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lVHyg-0000lW-Bs for guix-patches@gnu.org; Sat, 10 Apr 2021 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47693] [PATCH]: Use 'cc-for-target'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Apr 2021 18:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47693@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16180778602887 (code B ref -1); Sat, 10 Apr 2021 18:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Apr 2021 18:04:20 +0000 Received: from localhost ([127.0.0.1]:53254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVHxz-0000kT-68 for submit@debbugs.gnu.org; Sat, 10 Apr 2021 14:04:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:42828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVHxw-0000kJ-TL for submit@debbugs.gnu.org; Sat, 10 Apr 2021 14:04:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVHxw-00058L-Nw for guix-patches@gnu.org; Sat, 10 Apr 2021 14:04:16 -0400 Received: from xavier.telenet-ops.be ([2a02:1800:120:4::f00:14]:38254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVHxr-0003cr-Oe for guix-patches@gnu.org; Sat, 10 Apr 2021 14:04:16 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id r646240080mfAB401646t9; Sat, 10 Apr 2021 20:04:06 +0200 Message-ID: <951b5d9f5c46625e1a06fc925454d11678d4e55e.camel@telenet.be> From: Maxime Devos Date: Sat, 10 Apr 2021 20:03:40 +0200 User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1618077846; bh=r+PWSDOc36UtRSO1WnRC0mNlL4DhXG7Y9Ab0KjKe+Z8=; h=Subject:From:To:Date; b=nvBBeE2wAqiUp6J+q+K7oJ+fEQmqQCaONib3UgmVvIbBUkPY9SD5C6+JDbhQa6TU8 C+jSwm0CXMN1eqFC4hsWS13XxT+f4HNR/ZMSxcdL/7KwptlJ4cgnCzUVC6SiLmIEq/ 2AX6eJAaJZMD4K+ErHabS82W9t+JQ0En2khAmR+DWnZehkHTSgQW7cdOvz+gedHHTo AZkUsdJooKPnkr/q6DIwO+KOFN1aeqFpMP32OmzWcL5s6MPozyUwXVV+d8zaoZZW5x xtiqVg59wZtrVGJS8D9qRw939Yga7Bmkmo49e/79ngAuk4v1oK5rMMAG0r8M9RnInG RCncwca5UCmIw== Received-SPF: pass client-ip=2a02:1800:120:4::f00:14; envelope-from=maximedevos@telenet.be; helo=xavier.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 addressed some warnings generated by the linter defined in #47676. There will (presumably) be more patches along these lines later. These patches do *not* cause any rebuilds (except when cross-compiling), as (string-append "CC=" (cc-for-target)) evaluates to "CC=gcc" when not cross-compiling (this is evaluated from within Guix, not from in the build container, so this doesn't cause a derivation change). An exception is xssproxy, which needs to be rebuilt, due to nested usage of quasiquote / unquote. It can probably be worked-around but I don't think it's worth it for a single package. ./pre-inst-env guix build guix still succeeds, and the derivation for guix isn't even changed: $./pre-inst-env guix weather guix > computing 1 package derivations for x86_64-linux... > looking for 1 store items on https://ci.guix.gnu.org... > https://ci.guix.gnu.org > 100.0% substitutes available (1 out of 1) > [...] Now running "./pre-inst-env guix pull --url=$PWD --profile=tmp-prof --disable-authentication --allow-downgrades --banch=BRANCH"; I'll let you know if this fails. Greetings, Maxime From 688ac40430952dc34bfb239ddf29da366b74b3bc Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 9 Apr 2021 21:46:24 +0200 Subject: [PATCH 01/16] gnu: irc: Use 'cc-for-target'. As replacing "CC=gcc" with ,(string-append "CC=" (cc-for-target)) does not change the derivation, this patch will not cause any rebuilds, except when cross-compiling (but cross-compiling wass broken anyway). Likewise for the other patches in this series. * gnu/packages/irc.scm (ii, sic)[arguments]<#:make-flags>: Use 'cc-for-target'. --- gnu/packages/irc.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 5fba72b576..12f50cc523 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -30,6 +30,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -341,7 +342,7 @@ for the IRCv3 protocol.") (arguments `(#:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" %output) - "CC=gcc") + ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure @@ -365,7 +366,7 @@ for the IRCv3 protocol.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" + #:make-flags (list ,(string-append "CC=" (cc-for-target)) (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases -- 2.31.1