[bug#77103,v1] gnu: glibc/hurd: Hide to prevent warning

Message ID Z9mxdInFZ81EAXne@kernelpanicroom
State New
Headers
Series [bug#77103,v1] gnu: glibc/hurd: Hide to prevent warning |

Commit Message

Jakob Kirsch March 18, 2025, 5:46 p.m. UTC
When dealing with the glibc package, you will often see the following warning:

warning: ambiguous package specification `glibc'
warning: choosing glibc@2.39 from gnu/packages/base.scm:915:2

This is due to the fact that Hurd glibc is exported. A simple fix is to declare it as a hidden-package.

* gnu/packages/base.scm: (glibc/hurd): Hide

Change-Id: I3785a2d35e1c9b4efa039dbba7f379ae052dc69a
---
 gnu/packages/base.scm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)


base-commit: fa39695bbc0c5f79838cbca55d55eebd821a8efa
--
2.48.1
  

Comments

Jonas Meeuws June 30, 2025, 11:30 a.m. UTC | #1
I find that `guix build glibc`, with or without version spec, currently 
builds either glibc or glibc/hurd *at random*.
  
Simon Tournier Aug. 22, 2025, 12:10 p.m. UTC | #2
Hi,

CC: Hurd team. :-)

On Tue, 18 Mar 2025 at 18:46, Jakob Kirsch via Guix-patches via <guix-patches@gnu.org> wrote:
> When dealing with the glibc package, you will often see the following warning:
>
> warning: ambiguous package specification `glibc'
> warning: choosing glibc@2.39 from gnu/packages/base.scm:915:2
>
> This is due to the fact that Hurd glibc is exported. A simple fix is to declare it as a hidden-package.
>
> * gnu/packages/base.scm: (glibc/hurd): Hide
>
> Change-Id: I3785a2d35e1c9b4efa039dbba7f379ae052dc69a
> ---
>  gnu/packages/base.scm | 23 ++++++++++++-----------
>  1 file changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
> index 4c96ffa1a4..e8d502de8d 100644
> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -1663,17 +1663,18 @@ (define-public which
>      (license gpl3+))) ; some files are under GPLv2+
>
>  (define-public glibc/hurd
> -  (package/inherit glibc
> -    (source
> -     (origin
> -       (inherit (package-source glibc))
> -       (patches
> -        (append (origin-patches (package-source glibc))
> -                (search-patches "glibc-hurd-pthread_setcancelstate.patch"
> -                                "glibc-hurd64-fault.patch"
> -                                "glibc-hurd64-intr-msg-clobber.patch"
> -                                "glibc-hurd64-sgms-context.patch"
> -                                "glibc-hurd64-gcc-14.2-tls-bug.patch")))))))
> +  (hidden-package
> +    (package/inherit glibc
> +      (source
> +       (origin
> +         (inherit (package-source glibc))
> +         (patches
> +          (append (origin-patches (package-source glibc))
> +                  (search-patches "glibc-hurd-pthread_setcancelstate.patch"
> +                                  "glibc-hurd64-fault.patch"
> +                                  "glibc-hurd64-intr-msg-clobber.patch"
> +                                  "glibc-hurd64-sgms-context.patch"
> +                                  "glibc-hurd64-gcc-14.2-tls-bug.patch"))))))))
>
>  (define-public glibc/hurd-headers
>    (package/inherit glibc/hurd
>
> base-commit: fa39695bbc0c5f79838cbca55d55eebd821a8efa
> --
> 2.48.1

Hurd team, what do you think about this patch?

Cheers,
simon
  
yelninei--- via Guix-patches via Aug. 23, 2025, 1:16 p.m. UTC | #3
Hi,


Aug 22, 2025, 13:50 by zimon.toutoune@gmail.com:

> Hi,
>
> CC: Hurd team. :-)
>
> Hurd team, what do you think about this patch?
>

Since the core-packages-team merge glibc/hurd is an alias for glibc.
See 72dbcff9377d693ba2fe7e8563d7e40de6e19765

I don't think this is an issue currently but it might become one again when additional patches are added to glibc/hurd 

> Cheers,
> simon
>
>
  

Patch

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4c96ffa1a4..e8d502de8d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1663,17 +1663,18 @@  (define-public which
     (license gpl3+))) ; some files are under GPLv2+

 (define-public glibc/hurd
-  (package/inherit glibc
-    (source
-     (origin
-       (inherit (package-source glibc))
-       (patches
-        (append (origin-patches (package-source glibc))
-                (search-patches "glibc-hurd-pthread_setcancelstate.patch"
-                                "glibc-hurd64-fault.patch"
-                                "glibc-hurd64-intr-msg-clobber.patch"
-                                "glibc-hurd64-sgms-context.patch"
-                                "glibc-hurd64-gcc-14.2-tls-bug.patch")))))))
+  (hidden-package
+    (package/inherit glibc
+      (source
+       (origin
+         (inherit (package-source glibc))
+         (patches
+          (append (origin-patches (package-source glibc))
+                  (search-patches "glibc-hurd-pthread_setcancelstate.patch"
+                                  "glibc-hurd64-fault.patch"
+                                  "glibc-hurd64-intr-msg-clobber.patch"
+                                  "glibc-hurd64-sgms-context.patch"
+                                  "glibc-hurd64-gcc-14.2-tls-bug.patch"))))))))

 (define-public glibc/hurd-headers
   (package/inherit glibc/hurd