bug#57060: closed ([PATCH] gnu: pcc: Fix build.)

[GNU bug Tracking System]

Your message dated Thu, 11 Aug 2022 10:29:08 +0200
with message-id <874jyj420b.fsf_-_@gnu.org>
and subject line Re: bug#57060: [PATCH] gnu: pcc: Fix build.
has caused the debbugs.gnu.org bug report #57060,
regarding [PATCH] gnu: pcc: Fix build.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
57060: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57060
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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@disroot.org>
>  ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
>  ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
> +;;; Copyright © 2022 ( <paren@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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#57060: [PATCH] gnu: pcc: Fix build.
>
>
>
>
> Date: 
>
> Thu, 11 Aug 2022 10:29:08 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux)
>
>
>
>
> > * gnu/packages/c.scm (pcc)[arguments]<#:phases>{check}: Respect the
> >   `tests?` argument.
>
> Pushed both patches, thanks Maxime for reviewing.
>
> Mathieu
>
>
> --- End Message ---