From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8EEOGtYBXWSfOgEASxT56A (envelope-from ) for ; Thu, 11 May 2023 16:55:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yO8AGtYBXWQjCgEA9RJhRA (envelope-from ) for ; Thu, 11 May 2023 16:55:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 30657DAED for ; Thu, 11 May 2023 16:55:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px7hB-0000MA-IS; Thu, 11 May 2023 10:55:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px7h8-0000LW-Bl for guix-patches@gnu.org; Thu, 11 May 2023 10:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1px7h8-0006a3-3X for guix-patches@gnu.org; Thu, 11 May 2023 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1px7h7-0003Fo-Uv for guix-patches@gnu.org; Thu, 11 May 2023 10:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63416] [PATCH v2 2/2] gnu: gcc: Change make-gccgo to use gexp's. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2023 14:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63416 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63416@debbugs.gnu.org Received: via spool by 63416-submit@debbugs.gnu.org id=B63416.168381685512346 (code B ref 63416); Thu, 11 May 2023 14:55:01 +0000 Received: (at 63416) by debbugs.gnu.org; 11 May 2023 14:54:15 +0000 Received: from localhost ([127.0.0.1]:53120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1px7gM-0003D4-QM for submit@debbugs.gnu.org; Thu, 11 May 2023 10:54:15 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1px7gK-0003Cr-H6 for 63416@debbugs.gnu.org; Thu, 11 May 2023 10:54:13 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id B953027BBF0 for <63416@debbugs.gnu.org>; Thu, 11 May 2023 15:54:11 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7ba22d0b for <63416@debbugs.gnu.org>; Thu, 11 May 2023 14:54:10 +0000 (UTC) From: Christopher Baines Date: Thu, 11 May 2023 15:54:10 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: <0c9c655159c65003e63d7ddc9f69a87608ae7ccd.1683816850.git.mail@cbaines.net> References: <0c9c655159c65003e63d7ddc9f69a87608ae7ccd.1683816850.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683816918; a=rsa-sha256; cv=none; b=AWRuAR8jiRiRE34XzPbJYmdRSVtG5MCjBWetq57icCnLbmMq6G/2T1YY3S0RHio5Q4l9Ma i7dss2v7/srkIo5bFVM8PPmsg4SJYWKKjm+P459wRZLnGieKwWPk41CaYUevC2Epy1aGDV DfuzGyY+Zl9C6/LjyV1C1Ogxo3jEVM2CvUH3Vrw4Cu62gmES3RySXKzfwLZKZMnNzHnYKY MgERgBWjdMywKc5qMCf8+5TMkQdqgWocpblP0QQddq4ury4aMpuNhgZSYxzQR7tTFja+7F OZ4YR9PMgSIzZoS2m46abYJt5O3dVhhHjbZjhBnidpK0IWJ9IvpdzOzo1A5+2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683816918; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=QtpdCannEHtB9sbOCb2SzR7AIawGTcMJ7OMLDiprDkU=; b=qQSaG3dSQnS+Y8djR7GpWrU99fg7UFirYe1oqudlU2e5B2XRbUfNbX2pAfL13ALcKv92yu 13iyUz4cd2N/qS0ZOoF2As4t3nQrtcSsWdsn0MjnyqNAENCt3pPq2PjxCj+spNhrj0X259 ZpS/2GBQfqQjwO1Zr763uYsiv4iFGPMfYhrpq5rmWOZSE4VF0WUoJES72Kh74/5hbajJmT +5OZ/p7vf2SK1Md55HpGwatwPz+hIRiW/toMdIBUAr242+c/g8NFxFmN1FBb1+aqEyPIYs BfLFEmPV4qubrHw7dqnpZ3hsJLeuG7d12bNg2va1/wIqCnAOycdusR+H19fgOg== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.18 X-Spam-Score: -0.18 X-Migadu-Queue-Id: 30657DAED X-TUID: wqZv18pOVLOa As otherwise this seems to generate broken derivations for i586-gnu. * gnu/packages/gcc.scm (make-gccgo): Use gexp's for the package arguments. --- gnu/packages/gcc.scm | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1db37529f7..1b444c2b02 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1156,34 +1156,34 @@ (define (make-gccgo gcc) (arguments (substitute-keyword-arguments (package-arguments gccgo) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'wrap-go-with-tool-path - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (exedir (string-append out "/libexec/gcc")) - (tooldir (dirname (car (find-files exedir "^cgo$"))))) - (wrap-program (string-append out "/bin/go") - `("GCCGOTOOLDIR" = - (,(string-append "${GCCGOTOOLDIR:-" tooldir "}"))) - `("GOROOT" = - (,(string-append "${GOROOT:-" out "}"))))))) - (add-before 'configure 'fix-gotools-runpath - (lambda _ - (substitute* "gotools/Makefile.in" - (("AM_LDFLAGS =" all) - (string-append all " -Wl,-rpath=$(libdir) "))))) - (add-before 'configure 'remove-tool-reference-from-libgo - (lambda _ - (substitute* "libgo/Makefile.in" - (("(GccgoToolDir = \\\")[^\\\"]+" _ start) - (string-append start "/nonexistent")) - ,@(if (version>=? (package-version gccgo) "12.0") - '((("(defaultGOROOT = `)[^`]+" _ start) - (string-append start "/nonexistent"))) - '((("(DefaultGoroot = \\\")[^\\\"]+" _ start) - (string-append start "/nonexistent")))) - (("(defaultGOROOTValue.*?return `)[^`]+" _ start) - (string-append start "/nonexistent")))))))))))) + #~(modify-phases #$phases + (add-after 'install 'wrap-go-with-tool-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (exedir (string-append out "/libexec/gcc")) + (tooldir (dirname (car (find-files exedir "^cgo$"))))) + (wrap-program (string-append out "/bin/go") + `("GCCGOTOOLDIR" = + (,(string-append "${GCCGOTOOLDIR:-" tooldir "}"))) + `("GOROOT" = + (,(string-append "${GOROOT:-" out "}"))))))) + (add-before 'configure 'fix-gotools-runpath + (lambda _ + (substitute* "gotools/Makefile.in" + (("AM_LDFLAGS =" all) + (string-append all " -Wl,-rpath=$(libdir) "))))) + (add-before 'configure 'remove-tool-reference-from-libgo + (lambda _ + (substitute* "libgo/Makefile.in" + (("(GccgoToolDir = \\\")[^\\\"]+" _ start) + (string-append start "/nonexistent")) + #$@(if (version>=? (package-version gccgo) "12.0") + '((("(defaultGOROOT = `)[^`]+" _ start) + (string-append start "/nonexistent"))) + '((("(DefaultGoroot = \\\")[^\\\"]+" _ start) + (string-append start "/nonexistent")))) + (("(defaultGOROOTValue.*?return `)[^`]+" _ start) + (string-append start "/nonexistent")))))))))))) (define-public gccgo-4.9 (custom-gcc (package -- 2.39.1