From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id OCk3F3lh8WJV+AAAbAwnHQ (envelope-from ) for ; Mon, 08 Aug 2022 21:18:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id ePAbF3lh8WJTxgAAauVa8A (envelope-from ) for ; Mon, 08 Aug 2022 21:18:17 +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 321B71DC1F for ; Mon, 8 Aug 2022 21:18:17 +0200 (CEST) Received: from localhost ([::1]:60074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL8GW-0006rH-4p for larch@yhetil.org; Mon, 08 Aug 2022 15:18:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL8GI-0006qw-JX for guix-patches@gnu.org; Mon, 08 Aug 2022 15:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL8GI-0007O9-AY for guix-patches@gnu.org; Mon, 08 Aug 2022 15:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL8GI-0005N9-4o for guix-patches@gnu.org; Mon, 08 Aug 2022 15:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57060] [PATCH v2 1/2] gnu: pcc: Fix build. References: <20220808163529.12354-1-paren@disroot.org> In-Reply-To: <20220808163529.12354-1-paren@disroot.org> Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57060@debbugs.gnu.org Cc: "\(" Received: via spool by 57060-submit@debbugs.gnu.org id=B57060.165998626520623 (code B ref 57060); Mon, 08 Aug 2022 19:18:02 +0000 Received: (at 57060) by debbugs.gnu.org; 8 Aug 2022 19:17:45 +0000 Received: from localhost ([127.0.0.1]:42028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL8G1-0005MZ-6T for submit@debbugs.gnu.org; Mon, 08 Aug 2022 15:17:45 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL8Fz-0005MR-GL for 57060@debbugs.gnu.org; Mon, 08 Aug 2022 15:17:44 -0400 Received: by disroot.org (Postfix, from userid 107) id D8BBB45E83; Mon, 8 Aug 2022 21:08:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659985724; bh=1mylBz4hXzvPHBuJWI7Twk1UGDB8EsVpXQU0ypamqhU=; h=From:To:Cc:Subject:Date; b=CTnZdx1s98Wm3z9UYcfTx3MhjExw8T9BTmTWKy/sK/y4AcDJs/cL4O/HPLEUhkX/y cwmigv0EfIh5tChx/pdXLE+jJ6D0laJNw2uODHvwb/BwSBYnqXsBWUMrLA3seH4ZYX dp03QC+82wc6Rio4SIXZ9Xttndufotepp+qzonER4D4OGIaP1OLqN5axHMkfp5/3ta rv7w7mAVhshbPZKz+uibNnxjGdlnC8t7a6gdusCHLUO5ziK/Cgp9+H1ePWMhE3af3t EFXKysmTANYx9D+TX+2DY51GmWvCdcu2Q+bq4yJGs9jXKh/eGBJlsVZDdlaaPz8GDS l9IqRLPHmQfGg== Date: Mon, 8 Aug 2022 20:08:38 +0100 Message-Id: <20220808190839.20727-1-paren@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" 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=1659986297; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wJfYcBp+fM3PTG6er+EKPnXEa1cp2rv8p0WScdnvJ08=; b=e2l+TCo7RdAoJZD8kwVQKvvqu0kPk0T/dC5wa8lV1I7cZh7l8o8CKoLY50ANeaKuD2giNb oUM+sHrrXZwIuO7WybQ3HkkFrc0LEivHGxjUTuGD48ZQVyArWIZmK7iGkpQHbJo+3JMcGD tTi3+CXgdXb+1hus0NvhKxFQCQap+77c/FSrbob/YmySfaPJjLTrbAUeaDFEMnesQ6kuxA 8tHqBSx6Ztde8f29nugIp6yEZcDVbeMVO3ZjplvZAg/LYHund6S153hzuhhgerXpf1hFVw mxNM5a9PHziK8dkqIMPAvw+qaFZzjTPW3ybaxUTL8Rh/FROppc4Dfq5std6QwA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659986297; a=rsa-sha256; cv=none; b=SS8tD2w0+8aR5PZ869oWsVjgC8p4KWeygiqrik/kGOBVPXD+YwMqwadaEnn9emRpGAwPfQ NUAUpbxb59SwWZNSoRPFJz5H6SeXz0pH1ieaRWmLBgW9LvbDX+uDeRhJMKmmNONCh/RpCj QqZ2p86Y16ogu9R4PEc2ayqOp5f4t/6Nb7EVMEHeZDEa7AEEw1bcVQlTMeULpv43hyq5DE B3SGOs61hrrQC8tg1LuLsE03jkqp1HZR10825boPuZKf4Ob8JKqB9BaWO1vFmH1Zl8Eiqr I5Lz1HR38bOAQYNMrDaqVbF+pru2TdX5FYxJJIGMl5vTYBGrYeuV5XVO4PjAyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=CTnZdx1s; 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.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=CTnZdx1s; 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: 321B71DC1F X-Spam-Score: -3.39 X-Migadu-Scanner: scn0.migadu.com X-TUID: tOWBdS3ml405 * 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