[PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers and hurd-minimal.

[PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers and hurd-minimal.

[Manolis Ragkousis]

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

While investigating our other problem, I found this one, so here is a patch.

There is a circular dependency between glibc-hurd-headers and
hurd-minimal, where
one expects the other, while only the later needs the former.

[-- Attachment #2: 0001-gnu-base-Avoid-circular-dependency-among-glibc-hurd-.patch --]
[-- Type: text/x-patch, Size: 1097 bytes --]

From 744e51fc7f61685fd6785a64cefbaeb3cf87d2ec Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Wed, 27 May 2015 17:22:43 +0300
Subject: [PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers
 and hurd-minimal.

There is a circular dependency between glibc-hurd-headers and hurd-minimal, where
one expects the other, while only the later needs the former.

* gnu/packages/base.scm (glibc/hurd-headers): Add correct propagated-inputs.
---
 gnu/packages/base.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 0c6422d..5256354 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -758,6 +758,8 @@ command.")
   (package (inherit glibc/hurd)
     (name "glibc-hurd-headers")
     (outputs '("out"))
+    (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
+                         ("hurd-headers" ,hurd-headers)))
     (arguments
      (substitute-keyword-arguments (package-arguments glibc/hurd)
        ;; We just pass the flags really needed to build the headers.
-- 
2.4.1

Re: [PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers and hurd-minimal.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From 744e51fc7f61685fd6785a64cefbaeb3cf87d2ec Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Wed, 27 May 2015 17:22:43 +0300
> Subject: [PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers
>  and hurd-minimal.
>
> There is a circular dependency between glibc-hurd-headers and hurd-minimal, where
> one expects the other, while only the later needs the former.
>
> * gnu/packages/base.scm (glibc/hurd-headers): Add correct propagated-inputs.

[...]

> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -758,6 +758,8 @@ command.")
>    (package (inherit glibc/hurd)
>      (name "glibc-hurd-headers")
>      (outputs '("out"))
> +    (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
> +                         ("hurd-headers" ,hurd-headers)))
>      (arguments
>       (substitute-keyword-arguments (package-arguments glibc/hurd)
>         ;; We just pass the flags really needed to build the headers.

The patch makes sense to me: it’s a case of library A using headers of
libraries B and C, so B and C must be propagated.

I’m not sure why you mention a circular dependency in the message, and
what this has to do with that though.  I think the message should simply
be:

  gnu: glibc/hurd-headers: Propagate Hurd and Mach headers.

  * gnu/packages/base.scm (glibc/hurd-headers)[propagated-inputs]: New
    field.

Thanks!

Ludo’.

Re: [PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers and hurd-minimal.

[Manolis Ragkousis]

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

Updated patch.

Should I push?

[-- Attachment #2: 0001-gnu-glibc-hurd-headers-Propagate-Hurd-and-Mach-heade.patch --]
[-- Type: text/x-patch, Size: 930 bytes --]

From 7016fba81c037f32ae749fd638ed453f180922f4 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Wed, 27 May 2015 17:22:43 +0300
Subject: [PATCH] gnu: glibc/hurd-headers: Propagate Hurd and Mach headers.

* gnu/packages/base.scm (glibc/hurd-headers)[propagated-inputs]: New
  field.
---
 gnu/packages/base.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 6f46119..db50652 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -762,6 +762,8 @@ command.")
   (package (inherit glibc/hurd)
     (name "glibc-hurd-headers")
     (outputs '("out"))
+    (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
+                         ("hurd-headers" ,hurd-headers)))
     (arguments
      (substitute-keyword-arguments (package-arguments glibc/hurd)
        ;; We just pass the flags really needed to build the headers.
-- 
2.4.1

Re: [PATCH] gnu: base: Avoid circular dependency among glibc-hurd-headers and hurd-minimal.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> Updated patch.
>
> Should I push?
>
> From 7016fba81c037f32ae749fd638ed453f180922f4 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Wed, 27 May 2015 17:22:43 +0300
> Subject: [PATCH] gnu: glibc/hurd-headers: Propagate Hurd and Mach headers.
>
> * gnu/packages/base.scm (glibc/hurd-headers)[propagated-inputs]: New
>   field.

Sure!

Ludo'.