[bug#28667] [PATCH] gnu: cflow: Fix preprocess option.

[bug#28667] [PATCH] gnu: cflow: Fix preprocess option.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: cflow: Fix preprocess option. --]
[-- Type: text/x-patch, Size: 1102 bytes --]

From c2a8265ecb4e52b4447f75112dace21ed5ccc12a Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Mon, 2 Oct 2017 07:38:09 +0300
Subject: [PATCH] gnu: cflow: Fix preprocess option.

* gnu/packages/code.scm (cflow): Fix preprocess option.
---
 gnu/packages/code.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 6e04739f6..819c3e8d4 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -58,7 +58,12 @@
 
     ;; Needed to have cflow-mode.el installed.
     (native-inputs `(("emacs" ,emacs-minimal)))
-
+    (propagated-inputs `(("gcc" ,gcc-7)))
+    (arguments
+     '(#:configure-flags (list (string-append "CPPFLAGS="
+                                              "-D" "CFLOW_PREPROC=\\\""
+                                              (assoc-ref %build-inputs "gcc")
+                                              "/bin/cpp\\\""))))
     (home-page "https://www.gnu.org/software/cflow/")
     (synopsis "Create a graph of control flow within a program")
     (description
-- 
2.14.2

[bug#28667] [PATCH] gnu: cflow: Fix preprocess option.

[Oleg Pykhalov]

Oleg Pykhalov <go.wigust@gmail.com> writes:

>>From c2a8265ecb4e52b4447f75112dace21ed5ccc12a Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Mon, 2 Oct 2017 07:38:09 +0300
> Subject: [PATCH] gnu: cflow: Fix preprocess option.
>
> * gnu/packages/code.scm (cflow): Fix preprocess option.
> ---
>  gnu/packages/code.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
> index 6e04739f6..819c3e8d4 100644
> --- a/gnu/packages/code.scm
> +++ b/gnu/packages/code.scm
> @@ -58,7 +58,12 @@
>  
>      ;; Needed to have cflow-mode.el installed.
>      (native-inputs `(("emacs" ,emacs-minimal)))
> -
> +    (propagated-inputs `(("gcc" ,gcc-7)))

I also build and used successfully without propagated-inputs.  

$ guix gc --references /gnu/store/v71isli6q49clai9kkc0yylq26sl5x1d-cflow-1.5
/gnu/store/3x53yv4v144c9xp02rs64z7j597kkqax-gcc-5.4.0-lib
/gnu/store/5sv5zy2kgg6iaqyv8zw49w4243j0xkd0-gcc-5.4.0
/gnu/store/n6nvxlk2j8ysffjh3jphn1k5silnakh6-glibc-2.25
/gnu/store/v71isli6q49clai9kkc0yylq26sl5x1d-cflow-1.5

Do I actually need to propagated input `gcc-5' (aka `gcc')?

bug#28667: [PATCH] gnu: cflow: Fix preprocess option.

[Ludovic Courtès]

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> From c2a8265ecb4e52b4447f75112dace21ed5ccc12a Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Mon, 2 Oct 2017 07:38:09 +0300
> Subject: [PATCH] gnu: cflow: Fix preprocess option.
>
> * gnu/packages/code.scm (cflow): Fix preprocess option.
> ---
>  gnu/packages/code.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
> index 6e04739f6..819c3e8d4 100644
> --- a/gnu/packages/code.scm
> +++ b/gnu/packages/code.scm
> @@ -58,7 +58,12 @@
>  
>      ;; Needed to have cflow-mode.el installed.
>      (native-inputs `(("emacs" ,emacs-minimal)))
> -
> +    (propagated-inputs `(("gcc" ,gcc-7)))
> +    (arguments
> +     '(#:configure-flags (list (string-append "CPPFLAGS="
> +                                              "-D" "CFLOW_PREPROC=\\\""
> +                                              (assoc-ref %build-inputs "gcc")
> +                                              "/bin/cpp\\\""))))

Applied without the ‘propagated-inputs’, which is unnecessary, as you
hinted.   :-)

Thanks!

Ludo’.