From patchwork Tue Mar 18 17:46:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Kirsch X-Patchwork-Id: 40345 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8604127BBEA; Tue, 18 Mar 2025 17:49:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8A1CA27BBE2 for ; Tue, 18 Mar 2025 17:49:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tub3T-0006zJ-BG; Tue, 18 Mar 2025 13:48:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tub2u-0006tm-C9 for guix-patches@gnu.org; Tue, 18 Mar 2025 13:48:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tub2q-0001Pn-N8 for guix-patches@gnu.org; Tue, 18 Mar 2025 13:48:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=3+lEWFxybFG1aKvBdUG6SyzE5Z97DUBx72HEvRWayWU=; b=rhNeYFY7QjdiU11bkFqD1kfc8L3CROG3kCQc6aVQiwn6vAfyEp/V94Jc+t5e2luBN5PN+aGz/wBHMc+v3Lr0lFVZsisQPWdFM9vAa97I9mDi3lTioiQ1qu2Y0A1bZ9gUJqhE3oRVHmn9+RWMwVkdziqnraYF1X+v9t17ASsmeA54KXl5CIun3VPiGTEDLQj4o/0482cMSoJJpIucROHhusEIx1kFNkbDEYMdfjSho5+SrsadTmZj/OYAG81lcHeOUNxZcH7ue76Dv8T8buPpq2lEALZjaPmq1eeammQLqPl0RclYFCj5ngDQyJg/tftAJTZY5k3m79eRL5xLyGNhVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tub2p-00076J-Tj for guix-patches@gnu.org; Tue, 18 Mar 2025 13:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77103] [PATCH v1] gnu: glibc/hurd: Hide to prevent warning Resent-From: Jakob Kirsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Mar 2025 17:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77103@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174232004126938 (code B ref -1); Tue, 18 Mar 2025 17:48:03 +0000 Received: (at submit) by debbugs.gnu.org; 18 Mar 2025 17:47:21 +0000 Received: from localhost ([127.0.0.1]:43054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tub27-00070A-JN for submit@debbugs.gnu.org; Tue, 18 Mar 2025 13:47:20 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55862) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tub24-0006z8-Uj for submit@debbugs.gnu.org; Tue, 18 Mar 2025 13:47:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tub1V-0006Ma-RQ for guix-patches@gnu.org; Tue, 18 Mar 2025 13:46:45 -0400 Received: from mout.web.de ([212.227.15.3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tub1S-00018c-AG for guix-patches@gnu.org; Tue, 18 Mar 2025 13:46:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1742319990; x=1742924790; i=jakob.kirsch@web.de; bh=3+lEWFxybFG1aKvBdUG6SyzE5Z97DUBx72HEvRWayWU=; h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version: Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=f67iZ69lsa0aYjDGZwVes1H2rk0RNQ5XWcimljAnoBjBeV0IMJAmdZ3AXx/BjYc4 uNRS1zDLON9l7a8KvT3yMeGtsXjUCiNcICcbgbBqEd+P7QKXOdUrtXYj6jyvDuXLy n3u6JhyimVkTXRfTbbEXgolnLCqvmrIzgvkTn05dd58uplx9Do0GQa8NRRSQApIbD DXrlGrye7HC0a5qmgIpyTqaAWTS6Zq9yfdAVa/9Nrv+hqi4pwqn9bdeGPJKLeVB5N 0bWTS8n+mNG8q/NlAXU5ff17rTwqSd3VrRHGAVkBAQtWmHC0Xj31Wt/qpdFyqxIvh D18OW8IP8V1KHZ1u8A== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from kernelpanicroom ([134.19.28.36]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MxHYK-1sx7fy092u-00vtTZ for ; Tue, 18 Mar 2025 18:46:30 +0100 Date: Tue, 18 Mar 2025 18:46:28 +0100 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:V2vodEwrQLIabD/6kUsvPHcvp6jh3sXkEnX8B0I2JsE5t9JLKxV Cm+zKF13VzsxFTy39HRQTEQGXfWKENcNVx0jzo0GWcz5IBiGSYJ0BRLx13t60XZiWXUXDas x9F4clZuBKS3er+uBIlDbGXZd3gHASG6R7cbiyo2cX6wsCz2QYF+lVCvMXgkFekADfdtJ72 IGYJuTpJPPLYZIudUZIhQ== UI-OutboundReport: notjunk:1;M01:P0:jkJPwjfGXCQ=;4JYRX8w30jbMe+JlucnV2cDazC8 Pe134EFhBD/X9Amc7ZFDshuoj+JFST5J+OMDkOFneXGH4pOCY+LGVnfI7sxAhOgB8DwtfEKAD 8XhZcT/TpEUB/pBbWqz9BoN7cK+WL0gJHeCVM3O6JnWaCCuA4efsHmrxanCflmtlnBkymDXWP tiy5CW5HADUK/lZgIMpEB6++xDd/47L/eu35BvQEe4GR2D77jh+n0841pJHhOoB6OAPVLdy46 a3BqobzvCf6KR7uQuwrUp8DlEZY5ubyr/AdxulcimY37EJg+APrj9G4oaAMV/Z3MyMBFBSrAb ptlWN6jBtWcjpV+MpWTpN3PK53xTPe+fjLi+D9o8D9+i3BzITzO4/Bekq3pryD3WgyJ3kPNIH eWaulPJanvPtboW53RDTm5rJdBvdh5kfoy2p4jY3Ch8Zd5EkTGiL+LXjCyaA24KCqTAstIWFA jBWHpbVvcpic3/Lcm5Y19unfv+8FRxORgKzJ7ILGPt+YFc8uZMJFrbM3FiW17Qo7uUmbv4sKb MDNNG7C02BJqHu9BvTV/RVzFKSLSqHUrDLHwVBjgRAK4GW/sdUtOFriQYT94zMCPeQ3DYQ7Gq Af9oWCniVun1i0EVQHngaFAvtUDNMHp3QzO4sQELI2/juT3zNRI6vM4HO/lRDjdpfb5fCsRBW TtThw0eNK4WvX58MRU/S2iUjlMe/ucExH3de2IQ2ud+PwuhFDUIyJ0kGp2m82hGFyItkdBrS2 AyKcWIVilQSthj7Cy08vp6Cdi4AMB8jn3Cw3obagYym/+TLZbgGFUuccX6CntrR5K7kW8I0lO ky3lVOoR0k8g7eRfNHfRtkIXLSX9cZdDWqnICLK+FjoGXNAL7VAsLqGW3vZls4tJNP5vywrHR vxXmeS1lj+w4GSYyi+41CJjystBNf/Jq4T/MYsEdDCRTfKOxY0iacUugfsIoXa6fUIozAniow 2zkqnk6Deymob/VOius64Kk+xnAgSKFxpDQtC8Oq9aVOtGh6yZrK9mlbxrcjYp3DZcOUqveZ0 rN2q/5AVZNYDXrnEhJ/goTs4uYRhNLxynTj2hDg+z80EXr/Ckpov8YuHPmihNCb2XSGiPujkL k+qzs6XtXmnuhozcdxG65IuvKB2ZTFDPpQNmdCDb+y7vpdQ1jh7PGfLPCowgz/OdSl+uWPqa0 5hIVXnz9fvkqfUHabOYZSVWt7s7mTD8G+LgU6MljRwpR2u3FimuFetZ2iTZ06XNP+uhmQ2CyR 0M3Rj7B+yHA9XCtA74yBXs/Xc1gWxWceDnf6Am0S8a9MvLhaMOjBIOkN0HoY/jCT7K99SZ0v+ MV1e2ORphXNFl8vLzAz2WvuLtL67MlfHsdOOxl6GN69wbyEUWq2g7kWK5eKuMtmOPnU8dzQtj QVkkF1vP6wj5OPQ0gJS3QuYPnCW5fMoDBt0g95RAS3QPQpah+IaCt0r3oApyN5B7YWQnD3Uf0 t1X3nDA== Received-SPF: pass client-ip=212.227.15.3; envelope-from=jakob.kirsch@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jakob Kirsch X-ACL-Warn: , Jakob Kirsch via Guix-patches X-Patchwork-Original-From: Jakob Kirsch via Guix-patches via From: Jakob Kirsch Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 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