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 ms5.migadu.com with LMTPS id yA3YH2s88WJiKAEAbAwnHQ (envelope-from ) for ; Mon, 08 Aug 2022 18:40:11 +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 iDvgH2s88WKbeAEA9RJhRA (envelope-from ) for ; Mon, 08 Aug 2022 18:40:11 +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 40EDD6521 for ; Mon, 8 Aug 2022 18:40:11 +0200 (CEST) Received: from localhost ([::1]:45908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL5nW-0005O7-Cb for larch@yhetil.org; Mon, 08 Aug 2022 12:40:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL5nO-0005Nz-QJ for guix-patches@gnu.org; Mon, 08 Aug 2022 12:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL5nO-0006xt-HT for guix-patches@gnu.org; Mon, 08 Aug 2022 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL5nO-0007Y0-BR for guix-patches@gnu.org; Mon, 08 Aug 2022 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57060] [PATCH] gnu: pcc: Fix build. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57060@debbugs.gnu.org Cc: "\(" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165997674928943 (code B ref -1); Mon, 08 Aug 2022 16:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Aug 2022 16:39:09 +0000 Received: from localhost ([127.0.0.1]:41834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL5mW-0007Wk-VB for submit@debbugs.gnu.org; Mon, 08 Aug 2022 12:39:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:33060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL5mV-0007Wd-91 for submit@debbugs.gnu.org; Mon, 08 Aug 2022 12:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL5mU-0005Eg-Qv for guix-patches@gnu.org; Mon, 08 Aug 2022 12:39:07 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL5mS-0006uI-Pl for guix-patches@gnu.org; Mon, 08 Aug 2022 12:39:06 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 620D74578A; Mon, 8 Aug 2022 18:39:01 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id jx4k8iqDP5d0; Mon, 8 Aug 2022 18:38:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659976533; bh=1mylBz4hXzvPHBuJWI7Twk1UGDB8EsVpXQU0ypamqhU=; h=From:To:Cc:Subject:Date; b=Vx7KOoPNQVFxzhAbmE6Hoz8U+HMyoLyXpfHIWvpcj2NEKQv6lCeKZIhUvT8Q8daLM LxzocOJMfOjUgfdtLRv2m9LWA5dk8aSaS8AFdvSs0aiLBZDSxySGWNZa8CIR+qDtU+ i4evJUrjcAKIL7Ls/VbDqhpCq5sz6KzHd6FdYS+HUGEOkVrOnnQCbK3z7fqRT+E8VP XycFQGH/VQ7/RyL5TixNzAl7AGIAOi4eo6mD3qgcxmyE3+OZTQqHnrIeXArDXgTB3B SRr8QoqCzsxZBUJPQL6Iw76hnNBVLyfSYPyvBCnnioz/BHdsxHDrfueAD+xWrf8oOK vvLWayV8B2Aiw== Date: Mon, 8 Aug 2022 17:35:29 +0100 Message-Id: <20220808163529.12354-1-paren@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" From: "\( via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659976811; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=wJfYcBp+fM3PTG6er+EKPnXEa1cp2rv8p0WScdnvJ08=; b=HNqnqXJhxktlmaL6qpBc5lPjJWLdX6Do1EnDHHQjdgmhgHOLo6sXZmYrbDqTv2H0ZopzMc hPkP9I/UPYKQVRPQk+MYAZd3DzqJl0QIOqe0wAMuSfuh1Cab5MVcASUJnIzM2Di9lhHPUk hQ5WstLPAN3uDgM0FSkXUVOtdRrxNSR5BnTAntyeAHL0LAxiZ94MChdLulvijfgZMFm25c hu11FhXDwMe50RENv8svA5JUhp8LVef3e01MtKgScnY2P9ftqxMVTF4tUp+jjcbXm7SNXm gdl6ybNNKPI4ne5ior6tLF+v3xXw7sMFlC+7aVtjN0av9AjvsGhUogsWBmwuDA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659976811; a=rsa-sha256; cv=none; b=kP3gZaWXiOCMF39y08NZ2/NueY/creNs+HP8INwCihu++AuQYlU4MYUBl99GGEenbj01of dD5Bv0mISUgNIYEKszX2P2xl/Hs5X+DYs5WRJwNygVOpKLMdAN28OTiSSlB9Q9Ml06XJxS GluMnsmLSiYgC5HOlC9IAnDuX30snj3JDii4yqG7KR9xqBlcdmarG7YwJvIDuDlxr7qVrg UHaGUbM0t9F/mt9X+pjeEeIYt9BYLQSozIdqfzdz4bfeXBzQse8ohzOkOyZL47/urVmTRp SOQMMgwFoLUAp+HbGcU0fvt/0Bccj1gfeEOu0lUgGtZnBwUBtG2QvzxPENhfAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Vx7KOoPN; dmarc=pass (policy=none) header.from=gnu.org; 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: -3.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Vx7KOoPN; dmarc=pass (policy=none) header.from=gnu.org; 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-Queue-Id: 40EDD6521 X-Spam-Score: -3.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9bTkE8zG0yFi * gnu/packages/c.scm (pcc)[arguments]: Use gexps. <#:phases>{fix-multiple-definitions}: New phase. [native-inputs]: Adjust formatting. --- gnu/packages/c.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 1630a40d17..113a331070 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 (unmatched parenthesis ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Ekaitz Zarraga +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,12 +186,20 @@ (define-public pcc "1p34w496095mi0473f815w6wbi57zxil106mg7pj6sg6gzpjcgww")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ (invoke "make" "-C" "cc/cpp" "test") #t))))) - (native-inputs - (list bison flex)) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-multiple-definitions + (lambda _ + ;; Certain variables are defined multiple times. This + ;; upsets the linker and causes a build failure. + (substitute* "cc/ccom/pass1.h" + (("FLT flt_zero;") "extern FLT flt_zero;")) + (substitute* (list "cc/ccom/scan.l" "cc/cxxcom/scan.l") + (("lineno, ") "")))) + (replace 'check + (lambda _ + (invoke "make" "-C" "cc/cpp" "test")))))) + (native-inputs (list bison flex)) (synopsis "Portable C compiler") (description "PCC is a portable C compiler. The project goal is to write a C99 -- 2.37.1