GNU bug report logs - #57060
[PATCH] gnu: pcc: Fix build.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57060 in the body.
You can then email your comments to 57060 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "(" <paren <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: "\(" <paren <at> disroot.org>
Subject: [PATCH] gnu: pcc: Fix build.
Date: Mon,  8 Aug 2022 17:35:29 +0100

* 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 <paren <at> disroot.org>
 ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
 ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz <at> elenq.tech>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;;
 ;;; 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

Message #8 received at 57060 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: "(" <paren <at> disroot.org>, 57060 <at> debbugs.gnu.org
Subject: Re: [bug#57060] [PATCH] gnu: pcc: Fix build.
Date: Mon, 8 Aug 2022 20:33:11 +0200

[Message part 1 (text/plain, inline)]

On 08-08-2022 18:35, ( via Guix-patches via wrote:
> +                 (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, ") ""))))

This looks like something upstream needs to know about.

> +               (replace 'check
> +                 (lambda _
> +                   (invoke "make" "-C" "cc/cpp" "test"))))))
(when tests? ...), in a follow-up or preceding patch (t was present in 
the old code), for --without-tests.

Greetings,
Maxime.

[OpenPGP_0x49E3EE22191725EE.asc (application/pgp-keys, attachment)]

[OpenPGP_signature (application/pgp-signature, attachment)]

Message #11 received at 57060 <at> debbugs.gnu.org (full text, mbox):

From: "(" <paren <at> disroot.org>
To: "Maxime Devos" <maximedevos <at> telenet.be>, <57060 <at> debbugs.gnu.org>
Subject: Re: [bug#57060] [PATCH] gnu: pcc: Fix build.
Date: Mon, 08 Aug 2022 19:53:13 +0100

On Mon Aug 8, 2022 at 7:33 PM BST, Maxime Devos wrote:
> This looks like something upstream needs to know about.

I'm not sure upstream is particularly active. Also, the home-page is
down, so I'm not sure how to contact them :)

> (when tests? ...), in a follow-up or preceding patch (t was present in 
> the old code), for --without-tests.

Good point!

    -- (

Message #14 received at 57060 <at> debbugs.gnu.org (full text, mbox):

From: "(" <paren <at> disroot.org>
To: 57060 <at> debbugs.gnu.org
Cc: "\(" <paren <at> disroot.org>
Subject: [PATCH v2 2/2] gnu: pcc: Respect --without-tests.
Date: Mon,  8 Aug 2022 20:08:39 +0100

* gnu/packages/c.scm (pcc)[arguments]<#:phases>{check}: Respect the
  `tests?` argument.
---
 gnu/packages/c.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 113a331070..39f048e993 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -197,8 +197,9 @@ (define-public pcc
                    (substitute* (list "cc/ccom/scan.l" "cc/cxxcom/scan.l")
                      (("lineno, ") ""))))
                (replace 'check
-                 (lambda _
-                   (invoke "make" "-C" "cc/cpp" "test"))))))
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "make" "-C" "cc/cpp" "test")))))))
     (native-inputs (list bison flex))
     (synopsis "Portable C compiler")
     (description
-- 
2.37.1

Message #17 received at 57060 <at> debbugs.gnu.org (full text, mbox):

From: "(" <paren <at> disroot.org>
To: 57060 <at> debbugs.gnu.org
Cc: "\(" <paren <at> disroot.org>
Subject: [PATCH v2 1/2] gnu: pcc: Fix build.
Date: Mon,  8 Aug 2022 20:08:38 +0100

* 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 <paren <at> disroot.org>
 ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
 ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz <at> elenq.tech>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;;
 ;;; 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

Message #22 received at 57060-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: "(" <paren <at> disroot.org>
Cc: Maxime Devos <maximedevos <at> telenet.be>, 57060-done <at> debbugs.gnu.org
Subject: Re: bug#57060: [PATCH] gnu: pcc: Fix build.
Date: Thu, 11 Aug 2022 10:29:08 +0200

> * gnu/packages/c.scm (pcc)[arguments]<#:phases>{check}: Respect the
>   `tests?` argument.

Pushed both patches, thanks Maxime for reviewing.

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.