[PATCH 06/10] gnu: flex: Add m4 as a native input.

[PATCH 06/10] gnu: flex: Add m4 as a native input.

[Manolis Ragkousis]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0006-gnu-flex-Add-m4-as-a-native-input.patch --]
[-- Type: text/x-patch, Size: 965 bytes --]

From 59edf7d33961ffd6dd56567caaca1a23a109d144 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Tue, 12 May 2015 20:45:41 +0300
Subject: [PATCH 06/10] gnu: flex: Add m4 as a native input.

* gnu/packages/flex (flex): Add m4 as a native input.
---
 gnu/packages/flex.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index e76535c..3be777a 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -60,6 +60,10 @@
               (inputs (alist-delete "flex" (package-inputs bison))))))
        `(("bison" ,bison-for-tests)
          ("indent" ,indent))))
+    ;; m4 is not present in PATH when cross-building
+    (native-inputs (if (%current-target-system)
+                       `(("m4" ,m4))
+                       '()))
     (propagated-inputs `(("m4" ,m4)))
     (home-page "http://flex.sourceforge.net/")
     (synopsis "Fast lexical analyser generator")
-- 
2.4.1

Re: [PATCH 06/10] gnu: flex: Add m4 as a native input.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From 59edf7d33961ffd6dd56567caaca1a23a109d144 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Tue, 12 May 2015 20:45:41 +0300
> Subject: [PATCH 06/10] gnu: flex: Add m4 as a native input.
>
> * gnu/packages/flex (flex): Add m4 as a native input.
> ---
>  gnu/packages/flex.scm | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
> index e76535c..3be777a 100644
> --- a/gnu/packages/flex.scm
> +++ b/gnu/packages/flex.scm
> @@ -60,6 +60,10 @@
>                (inputs (alist-delete "flex" (package-inputs bison))))))
>         `(("bison" ,bison-for-tests)
>           ("indent" ,indent))))
> +    ;; m4 is not present in PATH when cross-building
> +    (native-inputs (if (%current-target-system)
> +                       `(("m4" ,m4))
> +                       '()))

Keep it like you did for Bison: add M4 unconditionally.

OK with this change for wip-hurd and/or core-updates.

Ludo’.

Re: [PATCH 06/10] gnu: flex: Add m4 as a native input.

[Manolis Ragkousis]

Done and pushed to wip-hurd.

Manolis